diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-06-24 13:38:47 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-06-24 16:36:30 +0200 |
| commit | 4589f23943a3820c8611adc0ec2fa8052df275a0 (patch) | |
| tree | 3ce1ae383f32b63d297a5c8ff91d765d74eaaf54 /target/linux/generic/backport-4.14/308-v4.16-netfilter-move-reroute-indirection-to-struct-nf_ipv6.patch | |
| parent | c22540ad3bb7e0da625802efe228aac1a8b58aad (diff) | |
| download | upstream-4589f23943a3820c8611adc0ec2fa8052df275a0.tar.gz upstream-4589f23943a3820c8611adc0ec2fa8052df275a0.tar.bz2 upstream-4589f23943a3820c8611adc0ec2fa8052df275a0.zip | |
kernel: bump 4.14 to 4.14.129
Refreshed all patches.
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.14/308-v4.16-netfilter-move-reroute-indirection-to-struct-nf_ipv6.patch')
| -rw-r--r-- | target/linux/generic/backport-4.14/308-v4.16-netfilter-move-reroute-indirection-to-struct-nf_ipv6.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-4.14/308-v4.16-netfilter-move-reroute-indirection-to-struct-nf_ipv6.patch b/target/linux/generic/backport-4.14/308-v4.16-netfilter-move-reroute-indirection-to-struct-nf_ipv6.patch index 6e9413e511..9303a0b777 100644 --- a/target/linux/generic/backport-4.14/308-v4.16-netfilter-move-reroute-indirection-to-struct-nf_ipv6.patch +++ b/target/linux/generic/backport-4.14/308-v4.16-netfilter-move-reroute-indirection-to-struct-nf_ipv6.patch @@ -171,7 +171,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- a/net/netfilter/nf_queue.c +++ b/net/netfilter/nf_queue.c -@@ -266,7 +266,6 @@ void nf_reinject(struct nf_queue_entry * +@@ -267,7 +267,6 @@ void nf_reinject(struct nf_queue_entry * const struct nf_hook_entry *hook_entry; const struct nf_hook_entries *hooks; struct sk_buff *skb = entry->skb; @@ -179,7 +179,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> const struct net *net; unsigned int i; int err; -@@ -293,8 +292,7 @@ void nf_reinject(struct nf_queue_entry * +@@ -294,8 +293,7 @@ void nf_reinject(struct nf_queue_entry * verdict = nf_hook_entry_hookfn(hook_entry, skb, &entry->state); if (verdict == NF_ACCEPT) { |