kernel: bump 4.14 to 4.14.120

[openwrt/staging/dedeckeh.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 88afdc22669f2fbba4403969048ae438f13a789e..f2ece780b4e186dab32423eafc3982662c9d39fb 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
@@ -11,7 +11,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
 
 --- a/net/netfilter/nf_tables_api.c
 +++ b/net/netfilter/nf_tables_api.c
-@@ -643,10 +643,7 @@ err:
+@@ -655,10 +655,7 @@ err:
        return err;
  }
  
@@ -23,7 +23,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  {
        struct nft_chain *chain;
        u32 i = 0;
-@@ -664,9 +661,7 @@ static void _nf_tables_table_disable(str
+@@ -676,9 +673,7 @@ static void _nf_tables_table_disable(str
        }
  }
  
@@ -34,7 +34,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  {
        struct nft_chain *chain;
        int err, i = 0;
-@@ -686,15 +681,13 @@ static int nf_tables_table_enable(struct
+@@ -698,15 +693,13 @@ static int nf_tables_table_enable(struct
        return 0;
  err:
        if (i)
@@ -53,7 +53,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  }
  
  static int nf_tables_updtable(struct nft_ctx *ctx)
-@@ -723,7 +716,7 @@ static int nf_tables_updtable(struct nft
+@@ -735,7 +728,7 @@ static int nf_tables_updtable(struct nft
                nft_trans_table_enable(trans) = false;
        } else if (!(flags & NFT_TABLE_F_DORMANT) &&
                   ctx->table->flags & NFT_TABLE_F_DORMANT) {
@@ -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;
-@@ -5791,7 +5784,6 @@ static int nf_tables_commit(struct net *
+@@ -5810,7 +5803,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;
                                }
-@@ -5955,7 +5947,6 @@ static int nf_tables_abort(struct net *n
+@@ -5974,7 +5966,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,