From 7c1dae6e269371f317040f30cb607bf46e7e1e26 Mon Sep 17 00:00:00 2001 From: Kabuli Chana Date: Fri, 9 Mar 2018 10:33:04 -0700 Subject: kernel: bump to version 4.14.25 compile/test target mvebu/rango Signed-off-by: Kabuli Chana --- .../331-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/generic/backport-4.14/331-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch') diff --git a/target/linux/generic/backport-4.14/331-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch b/target/linux/generic/backport-4.14/331-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch index a9f13c45df..2b7260c53d 100644 --- a/target/linux/generic/backport-4.14/331-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch +++ b/target/linux/generic/backport-4.14/331-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch @@ -62,7 +62,7 @@ Signed-off-by: Pablo Neira Ayuso if (ret >= 0) { ctx->table->flags &= ~NFT_TABLE_F_DORMANT; nft_trans_table_enable(trans) = true; -@@ -5719,7 +5712,6 @@ static int nf_tables_commit(struct net * +@@ -5721,7 +5714,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 trans->ctx.table); trans->ctx.table->flags |= NFT_TABLE_F_DORMANT; } -@@ -5881,7 +5873,6 @@ static int nf_tables_abort(struct net *n +@@ -5883,7 +5875,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, -- cgit v1.2.3