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.43
[openwrt/openwrt.git]
/
target
/
linux
/
generic
/
backport-4.14
/
303-v4.16-netfilter-nf_tables-remove-multihook-chains-and-fami.patch
diff --git
a/target/linux/generic/backport-4.14/303-v4.16-netfilter-nf_tables-remove-multihook-chains-and-fami.patch
b/target/linux/generic/backport-4.14/303-v4.16-netfilter-nf_tables-remove-multihook-chains-and-fami.patch
index 37c63ec6c6a4491a4f1b7b1af16ceadb1a4998c2..81f140441f3d56b93dfaa4359dfc142e31775b8f 100644
(file)
--- a/
target/linux/generic/backport-4.14/303-v4.16-netfilter-nf_tables-remove-multihook-chains-and-fami.patch
+++ b/
target/linux/generic/backport-4.14/303-v4.16-netfilter-nf_tables-remove-multihook-chains-and-fami.patch
@@
-265,7
+265,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
}
nft_chain_release_hook(&hook);
}
}
nft_chain_release_hook(&hook);
}
-@@ -506
2,10 +5050
,9 @@ static int nf_tables_commit(struct net *
+@@ -506
9,10 +5057
,9 @@ static int nf_tables_commit(struct net *
case NFT_MSG_DELCHAIN:
list_del_rcu(&trans->ctx.chain->list);
nf_tables_chain_notify(&trans->ctx, NFT_MSG_DELCHAIN);
case NFT_MSG_DELCHAIN:
list_del_rcu(&trans->ctx.chain->list);
nf_tables_chain_notify(&trans->ctx, NFT_MSG_DELCHAIN);
@@
-279,7
+279,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
break;
case NFT_MSG_NEWRULE:
nft_clear(trans->ctx.net, nft_trans_rule(trans));
break;
case NFT_MSG_NEWRULE:
nft_clear(trans->ctx.net, nft_trans_rule(trans));
-@@ -520
2,10 +5189
,9 @@ static int nf_tables_abort(struct net *n
+@@ -520
9,10 +5196
,9 @@ static int nf_tables_abort(struct net *n
} else {
trans->ctx.table->use--;
list_del_rcu(&trans->ctx.chain->list);
} else {
trans->ctx.table->use--;
list_del_rcu(&trans->ctx.chain->list);
@@
-293,7
+293,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
}
break;
case NFT_MSG_DELCHAIN:
}
break;
case NFT_MSG_DELCHAIN:
-@@ -53
06,7 +5292
,7 @@ int nft_chain_validate_hooks(const struc
+@@ -53
13,7 +5299
,7 @@ int nft_chain_validate_hooks(const struc
if (nft_is_base_chain(chain)) {
basechain = nft_base_chain(chain);
if (nft_is_base_chain(chain)) {
basechain = nft_base_chain(chain);
@@
-302,7
+302,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
return 0;
return -EOPNOTSUPP;
return 0;
return -EOPNOTSUPP;
-@@ -57
88,8 +5774
,7 @@ int __nft_release_basechain(struct nft_c
+@@ -57
95,8 +5781
,7 @@ int __nft_release_basechain(struct nft_c
BUG_ON(!nft_is_base_chain(ctx->chain));
BUG_ON(!nft_is_base_chain(ctx->chain));
@@
-312,7
+312,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
list_for_each_entry_safe(rule, nr, &ctx->chain->rules, list) {
list_del(&rule->list);
ctx->chain->use--;
list_for_each_entry_safe(rule, nr, &ctx->chain->rules, list) {
list_del(&rule->list);
ctx->chain->use--;
-@@ -58
18,8 +5803
,7 @@ static void __nft_release_afinfo(struct
+@@ -58
25,8 +5810
,7 @@ static void __nft_release_afinfo(struct
list_for_each_entry_safe(table, nt, &afi->tables, list) {
list_for_each_entry(chain, &table->chains, list)
list_for_each_entry_safe(table, nt, &afi->tables, list) {
list_for_each_entry(chain, &table->chains, list)