kernel: bump 4.9 to 4.9.150

[openwrt/openwrt.git] / target / linux / generic / backport-4.9 / 094-v4.12-0001-ip6_tunnel-Fix-missing-tunnel-encapsulation-limit-op.patch

diff --git a/target/linux/generic/backport-4.9/094-v4.12-0001-ip6_tunnel-Fix-missing-tunnel-encapsulation-limit-op.patch b/target/linux/generic/backport-4.9/094-v4.12-0001-ip6_tunnel-Fix-missing-tunnel-encapsulation-limit-op.patch
index 0ccbacf3d0d07df641faa4d4f83be0c326e54f67..7c3c5608c531347ee5af3fecc4c1f7e2042f1353 100644 (file)
--- a/target/linux/generic/backport-4.9/094-v4.12-0001-ip6_tunnel-Fix-missing-tunnel-encapsulation-limit-op.patch
+++ b/target/linux/generic/backport-4.9/094-v4.12-0001-ip6_tunnel-Fix-missing-tunnel-encapsulation-limit-op.patch
@@ -30,7 +30,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/net/ipv6/ip6_tunnel.c
 +++ b/net/ipv6/ip6_tunnel.c
-@@ -957,7 +957,7 @@ static void init_tel_txopt(struct ipv6_t
+@@ -958,7 +958,7 @@ static void init_tel_txopt(struct ipv6_t
        opt->dst_opt[5] = IPV6_TLV_PADN;
        opt->dst_opt[6] = 1;
  
@@ -39,7 +39,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        opt->ops.opt_nflen = 8;
  }
  
-@@ -1191,7 +1191,7 @@ route_lookup:
+@@ -1200,7 +1200,7 @@ route_lookup:
  
        if (encap_limit >= 0) {
                init_tel_txopt(&opt, encap_limit);
@@ -47,4 +47,4 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 +              ipv6_push_frag_opts(skb, &opt.ops, &proto);
        }
  
-       /* Calculate max headroom for all the headers and adjust
+       skb_push(skb, sizeof(struct ipv6hdr));