diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-12-18 14:12:50 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-12-18 15:12:06 +0100 |
| commit | 7b0e1d28e89e8932aa228ff2f37c274745eaa5e8 (patch) | |
| tree | dfaded69f238608d359af5737be5bb5a817d0ff1 /target/linux/generic/backport-4.14/306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch | |
| parent | 386a57dc596c95919024e0726582a996d801d9fb (diff) | |
| download | upstream-7b0e1d28e89e8932aa228ff2f37c274745eaa5e8.tar.gz upstream-7b0e1d28e89e8932aa228ff2f37c274745eaa5e8.tar.bz2 upstream-7b0e1d28e89e8932aa228ff2f37c274745eaa5e8.zip | |
kernel: bump 4.14 to 4.14.89
Refreshed all patches.
Compile-tested on: cns3xxx, imx6
Runtime-tested on: cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.14/306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch')
| -rw-r--r-- | target/linux/generic/backport-4.14/306-v4.16-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-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch b/target/linux/generic/backport-4.14/306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch index 75de3c84fe..2b44066f1a 100644 --- a/target/linux/generic/backport-4.14/306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch +++ b/target/linux/generic/backport-4.14/306-v4.16-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 -@@ -69,31 +69,6 @@ int ip6_route_me_harder(struct net *net, +@@ -70,31 +70,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) { -@@ -201,7 +176,6 @@ static const struct nf_ipv6_ops ipv6ops +@@ -202,7 +177,6 @@ static const struct nf_ipv6_ops ipv6ops static const struct nf_afinfo nf_ip6_afinfo = { .family = AF_INET6, .route = nf_ip6_route, |