projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 4.14 to 4.14.120
[openwrt/openwrt.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 ddcdb78a6ff64e40ed83a3c59d2666d23d703917..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
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
-@@ -6
40,10 +640
,7 @@ err:
+@@ -6
55,10 +655
,7 @@ err:
return err;
}
return err;
}
@@
-23,7
+23,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
{
struct nft_chain *chain;
u32 i = 0;
{
struct nft_chain *chain;
u32 i = 0;
-@@ -6
61,9 +658
,7 @@ static void _nf_tables_table_disable(str
+@@ -6
76,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;
{
struct nft_chain *chain;
int err, i = 0;
-@@ -6
83,15 +678
,13 @@ static int nf_tables_table_enable(struct
+@@ -6
98,15 +693
,13 @@ static int nf_tables_table_enable(struct
return 0;
err:
if (i)
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)
}
static int nf_tables_updtable(struct nft_ctx *ctx)
-@@ -7
20,7 +713
,7 @@ static int nf_tables_updtable(struct nft
+@@ -7
35,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) {
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;
if (ret >= 0) {
ctx->table->flags &= ~NFT_TABLE_F_DORMANT;
nft_trans_table_enable(trans) = true;
-@@ -5
791,7 +5784
,6 @@ static int nf_tables_commit(struct net *
+@@ -5
810,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,
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;
}
trans->ctx.table);
trans->ctx.table->flags |= NFT_TABLE_F_DORMANT;
}
-@@ -59
55,7 +5947
,6 @@ static int nf_tables_abort(struct net *n
+@@ -59
74,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,
if (nft_trans_table_update(trans)) {
if (nft_trans_table_enable(trans)) {
nf_tables_table_disable(net,