diff options
author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-03-02 13:11:44 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-03-05 21:05:45 +0100 |
commit | 05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5 (patch) | |
tree | 68e66de94e62af2e06719bd8e6b56f88ce80993a /target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch | |
parent | ef4bf8b403205062ddb38ebe7b8c4951be346368 (diff) | |
download | upstream-05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5.tar.gz upstream-05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5.tar.bz2 upstream-05ed7dc50d7fd0be3ea8d6bdf06227bdeae2e7a5.zip |
kernel: bump 5.10 to 5.10.103
Patches automatically rebased.
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch')
-rw-r--r-- | target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch b/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch index 56f68feac8..fa6e0c4173 100644 --- a/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch +++ b/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch @@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> nft_trans_table_update(trans) = true; list_add_tail(&trans->list, &ctx->net->nft.commit_list); return 0; -@@ -7903,11 +7907,10 @@ static int nf_tables_commit(struct net * +@@ -7908,11 +7912,10 @@ static int nf_tables_commit(struct net * switch (trans->msg_type) { case NFT_MSG_NEWTABLE: if (nft_trans_table_update(trans)) { @@ -86,7 +86,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> } else { nft_clear(net, trans->ctx.table); } -@@ -8120,11 +8123,9 @@ static int __nf_tables_abort(struct net +@@ -8125,11 +8128,9 @@ static int __nf_tables_abort(struct net switch (trans->msg_type) { case NFT_MSG_NEWTABLE: if (nft_trans_table_update(trans)) { |