diff options
| author | Kabuli Chana <newtownBuild@gmail.com> | 2018-03-09 10:33:04 -0700 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-09 22:12:48 +0100 |
| commit | 7c1dae6e269371f317040f30cb607bf46e7e1e26 (patch) | |
| tree | 71902c8572f1dfc9760cf6863d0bb4fac5346a09 /target/linux/generic/backport-4.14/331-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch | |
| parent | fa22714181de40648d9680f6d5d9d4f03547ccc1 (diff) | |
| download | upstream-7c1dae6e269371f317040f30cb607bf46e7e1e26.tar.gz upstream-7c1dae6e269371f317040f30cb607bf46e7e1e26.tar.bz2 upstream-7c1dae6e269371f317040f30cb607bf46e7e1e26.zip | |
kernel: bump to version 4.14.25
compile/test target mvebu/rango
Signed-off-by: Kabuli Chana <newtownBuild@gmail.com>
Diffstat (limited to 'target/linux/generic/backport-4.14/331-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch')
| -rw-r--r-- | target/linux/generic/backport-4.14/331-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch | 4 |
1 files changed, 2 insertions, 2 deletions
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 <pablo@netfilter.org> 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 <pablo@netfilter.org> 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, |