diff options
author | John Audia <therealgraysky@proton.me> | 2022-09-05 06:47:34 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-09-17 15:58:25 +0200 |
commit | 1b0db300cbef371e3975250828f1450aebacec8f (patch) | |
tree | 5918cd1f622202680ece5807c014f54006ba503d /target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch | |
parent | bf65d2dcbab89076994df9c93d43423b8f31a471 (diff) | |
download | upstream-1b0db300cbef371e3975250828f1450aebacec8f.tar.gz upstream-1b0db300cbef371e3975250828f1450aebacec8f.tar.bz2 upstream-1b0db300cbef371e3975250828f1450aebacec8f.zip |
kernel: bump 5.10 to 5.10.141
All patches automatically rebased.
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit e8a62a1e6040de71bdcb1be1a1c30c064acbc059)
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 | 6 |
1 files changed, 3 insertions, 3 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 eea0aed6aa..f9bb0e2cc3 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 @@ -12,7 +12,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- a/include/net/netfilter/nf_tables.h +++ b/include/net/netfilter/nf_tables.h -@@ -1469,13 +1469,16 @@ struct nft_trans_chain { +@@ -1474,13 +1474,16 @@ struct nft_trans_chain { struct nft_trans_table { bool update; @@ -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; -@@ -7929,11 +7933,10 @@ static int nf_tables_commit(struct net * +@@ -7919,11 +7923,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); } -@@ -8147,11 +8150,9 @@ static int __nf_tables_abort(struct net +@@ -8137,11 +8140,9 @@ static int __nf_tables_abort(struct net switch (trans->msg_type) { case NFT_MSG_NEWTABLE: if (nft_trans_table_update(trans)) { |