diff options
| author | Stijn Segers <foss@volatilesystems.org> | 2018-03-15 22:00:08 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-17 22:15:38 +0100 |
| commit | 9899ffcfd35120f7a4aa1d401b85653e56b775b0 (patch) | |
| tree | 6dc392a24cab58309b4727e8b6fde0aef9a9a0a3 /target/linux/generic/backport-4.14/310-netfilter-remove-struct-nf_afinfo-and-its-helper-fun.patch | |
| parent | 895ea64a761699dc29373b6d45a854dde4e08e1c (diff) | |
| download | upstream-9899ffcfd35120f7a4aa1d401b85653e56b775b0.tar.gz upstream-9899ffcfd35120f7a4aa1d401b85653e56b775b0.tar.bz2 upstream-9899ffcfd35120f7a4aa1d401b85653e56b775b0.zip | |
kernel: bump 4.14 to 4.14.27
* Refreshed patches.
* Deleted 812-pci-dwc-fix-enumeration.patch (was accepted upstream)
Compile-tested: ramips/mt7621, x86/64
Run-tested: ramips/mt7621, x86/64
Signed-off-by: Stijn Segers <foss@volatilesystems.org>
Diffstat (limited to 'target/linux/generic/backport-4.14/310-netfilter-remove-struct-nf_afinfo-and-its-helper-fun.patch')
| -rw-r--r-- | target/linux/generic/backport-4.14/310-netfilter-remove-struct-nf_afinfo-and-its-helper-fun.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-4.14/310-netfilter-remove-struct-nf_afinfo-and-its-helper-fun.patch b/target/linux/generic/backport-4.14/310-netfilter-remove-struct-nf_afinfo-and-its-helper-fun.patch index 474eedbff0..6d19743dfe 100644 --- a/target/linux/generic/backport-4.14/310-netfilter-remove-struct-nf_afinfo-and-its-helper-fun.patch +++ b/target/linux/generic/backport-4.14/310-netfilter-remove-struct-nf_afinfo-and-its-helper-fun.patch @@ -102,7 +102,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> -subsys_initcall(ipv4_netfilter_init); --- a/net/ipv6/netfilter.c +++ b/net/ipv6/netfilter.c -@@ -174,14 +174,10 @@ static const struct nf_ipv6_ops ipv6ops +@@ -175,14 +175,10 @@ static const struct nf_ipv6_ops ipv6ops .reroute = nf_ip6_reroute, }; @@ -118,7 +118,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> } /* This can be called from inet6_init() on errors, so it cannot -@@ -190,5 +186,4 @@ int __init ipv6_netfilter_init(void) +@@ -191,5 +187,4 @@ int __init ipv6_netfilter_init(void) void ipv6_netfilter_fini(void) { RCU_INIT_POINTER(nf_ipv6_ops, NULL); |