projects
/
openwrt
/
staging
/
dedeckeh.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.104
[openwrt/staging/dedeckeh.git]
/
target
/
linux
/
generic
/
backport-4.14
/
301-v4.16-netfilter-core-only-allow-one-nat-hook-per-hook-poin.patch
diff --git
a/target/linux/generic/backport-4.14/301-v4.16-netfilter-core-only-allow-one-nat-hook-per-hook-poin.patch
b/target/linux/generic/backport-4.14/301-v4.16-netfilter-core-only-allow-one-nat-hook-per-hook-poin.patch
index 05888a070efe2bfa4481762ed087feb74399d1c2..cd54aa01141464a86fb178582b254adebd0150e0 100644
(file)
--- a/
target/linux/generic/backport-4.14/301-v4.16-netfilter-core-only-allow-one-nat-hook-per-hook-poin.patch
+++ b/
target/linux/generic/backport-4.14/301-v4.16-netfilter-core-only-allow-one-nat-hook-per-hook-poin.patch
@@
-135,7
+135,7
@@
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
new->hooks[nhooks] = old->hooks[i];
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
new->hooks[nhooks] = old->hooks[i];
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
-@@ -143
1,6 +1431
,8 @@ static int nf_tables_addchain(struct nft
+@@ -143
4,6 +1434
,8 @@ static int nf_tables_addchain(struct nft
ops->hook = hookfn;
if (afi->hook_ops_init)
afi->hook_ops_init(ops, i);
ops->hook = hookfn;
if (afi->hook_ops_init)
afi->hook_ops_init(ops, i);