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/306-netfilter-remove-saveroute-indirection-in-struct-nf_.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/306-netfilter-remove-saveroute-indirection-in-struct-nf_.patch')
-rw-r--r-- | target/linux/generic/backport-4.14/306-netfilter-remove-saveroute-indirection-in-struct-nf_.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-4.14/306-netfilter-remove-saveroute-indirection-in-struct-nf_.patch b/target/linux/generic/backport-4.14/306-netfilter-remove-saveroute-indirection-in-struct-nf_.patch index 16fa90ee03..e52f81164e 100644 --- a/target/linux/generic/backport-4.14/306-netfilter-remove-saveroute-indirection-in-struct-nf_.patch +++ b/target/linux/generic/backport-4.14/306-netfilter-remove-saveroute-indirection-in-struct-nf_.patch @@ -125,7 +125,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> }; --- a/net/ipv6/netfilter.c +++ b/net/ipv6/netfilter.c -@@ -68,31 +68,6 @@ int ip6_route_me_harder(struct net *net, +@@ -69,31 +69,6 @@ int ip6_route_me_harder(struct net *net, } EXPORT_SYMBOL(ip6_route_me_harder); @@ -157,7 +157,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> static int nf_ip6_reroute(struct net *net, struct sk_buff *skb, const struct nf_queue_entry *entry) { -@@ -200,7 +175,6 @@ static const struct nf_ipv6_ops ipv6ops +@@ -201,7 +176,6 @@ static const struct nf_ipv6_ops ipv6ops static const struct nf_afinfo nf_ip6_afinfo = { .family = AF_INET6, .route = nf_ip6_route, |