diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2023-07-01 15:54:25 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-07-01 15:54:25 +0200 |
| commit | fbc23f664d85b396e9fbee1d5977d70bc4987d87 (patch) | |
| tree | 7aee815e56492b5e7cb2bad3201f1a8ca833f4e3 /target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch | |
| parent | 0344144e771c71b764966551283814de3653ce6a (diff) | |
| download | upstream-fbc23f664d85b396e9fbee1d5977d70bc4987d87.tar.gz upstream-fbc23f664d85b396e9fbee1d5977d70bc4987d87.tar.bz2 upstream-fbc23f664d85b396e9fbee1d5977d70bc4987d87.zip | |
kernel: bump 5.10 to 5.10.186
All patches automatically rebased.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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 43d60db186..1ae9e132cd 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 -@@ -1475,13 +1475,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; -@@ -7932,11 +7936,10 @@ static int nf_tables_commit(struct net * +@@ -7935,11 +7939,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); } -@@ -8153,11 +8156,9 @@ static int __nf_tables_abort(struct net +@@ -8156,11 +8159,9 @@ static int __nf_tables_abort(struct net switch (trans->msg_type) { case NFT_MSG_NEWTABLE: if (nft_trans_table_update(trans)) { |