kernel: bump 4.9 to 4.9.137

[openwrt/staging/chunkeey.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..136fdf48d30fd0965cc08aef0c9a0839124df0ee 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
@@ -39,7 +39,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        opt->ops.opt_nflen = 8;
  }
  
-@@ -1191,7 +1191,7 @@ route_lookup:
+@@ -1199,7 +1199,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));