kernel: bump 4.14 to 4.14.136

[openwrt/staging/jogo.git] / target / linux / generic / backport-4.14 / 306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch

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 b02ad8a0d7754e3f5ac6ba42e55e011b77a7af39..943b3eed305465d96df9522a2549870f2f2f94ca 100644 (file)
--- 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
@@ -212,10 +212,10 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  static int __nf_queue(struct sk_buff *skb, const struct nf_hook_state *state,
                      const struct nf_hook_entries *entries,
                      unsigned int index, unsigned int queuenum)
-@@ -144,7 +175,16 @@ static int __nf_queue(struct sk_buff *sk
+@@ -148,7 +179,16 @@ static int __nf_queue(struct sk_buff *sk
+       };
  
        nf_queue_entry_get_refs(entry);
-       skb_dst_force(skb);
 -      afinfo->saveroute(skb, entry);
 +
 +      switch (entry->state.pf) {