kernel: bump 4.14 to 4.14.43

[openwrt/staging/wigyori.git] / target / linux / generic / backport-4.14 / 331-v4.16-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch

diff --git a/target/linux/generic/backport-4.14/331-v4.16-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch b/target/linux/generic/backport-4.14/331-v4.16-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch
index 2b7260c53d246d0b53d636bf8d33ec390bf8e1bc..b4d0130a785871d90b78f41a97a7112ea570ce20 100644 (file)
--- a/target/linux/generic/backport-4.14/331-v4.16-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch
+++ b/target/linux/generic/backport-4.14/331-v4.16-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch
@@ -62,7 +62,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
                if (ret >= 0) {
                        ctx->table->flags &= ~NFT_TABLE_F_DORMANT;
                        nft_trans_table_enable(trans) = true;
-@@ -5721,7 +5714,6 @@ static int nf_tables_commit(struct net *
+@@ -5728,7 +5721,6 @@ static int nf_tables_commit(struct net *
                        if (nft_trans_table_update(trans)) {
                                if (!nft_trans_table_enable(trans)) {
                                        nf_tables_table_disable(net,
@@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
                                                                trans->ctx.table);
                                        trans->ctx.table->flags |= NFT_TABLE_F_DORMANT;
                                }
-@@ -5883,7 +5875,6 @@ static int nf_tables_abort(struct net *n
+@@ -5890,7 +5882,6 @@ static int nf_tables_abort(struct net *n
                        if (nft_trans_table_update(trans)) {
                                if (nft_trans_table_enable(trans)) {
                                        nf_tables_table_disable(net,