kernel: Bump to 4.14.224

[librecmc/librecmc.git] / target / linux / generic / backport-4.14 / 324-v4.16-netfilter-flow-table-support-for-IPv6.patch

diff --git a/target/linux/generic/backport-4.14/324-v4.16-netfilter-flow-table-support-for-IPv6.patch b/target/linux/generic/backport-4.14/324-v4.16-netfilter-flow-table-support-for-IPv6.patch
index 8e776383d1783585dee77de6d260f39aa2f89da3..7dc1dd7f461b3e5a2974390fffcbc4588ea752c5 100644 (file)
--- a/target/linux/generic/backport-4.14/324-v4.16-netfilter-flow-table-support-for-IPv6.patch
+++ b/target/linux/generic/backport-4.14/324-v4.16-netfilter-flow-table-support-for-IPv6.patch
@@ -26,7 +26,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  struct dst_entry *ip6_dst_lookup_flow(struct net *net, const struct sock *sk, struct flowi6 *fl6,
 --- a/net/ipv6/ip6_output.c
 +++ b/net/ipv6/ip6_output.c
  struct dst_entry *ip6_dst_lookup_flow(struct net *net, const struct sock *sk, struct flowi6 *fl6,
 --- a/net/ipv6/ip6_output.c
 +++ b/net/ipv6/ip6_output.c

-@@ -381,7 +381,7 @@ static inline int ip6_forward_finish(str
+@@ -419,7 +419,7 @@ static inline int ip6_forward_finish(str

        return dst_output(net, sk, skb);
  }
  
        return dst_output(net, sk, skb);
  }
  


@@ -35,7 +35,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  {
        unsigned int mtu;
        struct inet6_dev *idev;
  {
        unsigned int mtu;
        struct inet6_dev *idev;

-@@ -401,6 +401,7 @@ static unsigned int ip6_dst_mtu_forward(
+@@ -439,6 +439,7 @@ static unsigned int ip6_dst_mtu_forward(

  
        return mtu;
  }
  
        return mtu;
  }