From 6f388adef82057675c61b24afb7b2e0d8136c3fd Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Wed, 14 Nov 2018 12:32:49 +0100 Subject: kernel: bump 4.9 to 4.9.137 Refreshed all patches. Removed upstreamed hunks: - 703-phy-support-layerscape.patch Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte --- ...12-0001-ip6_tunnel-Fix-missing-tunnel-encapsulation-limit-op.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '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 b91bfb7f61..136fdf48d3 100644 --- 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 opt->ops.opt_nflen = 8; } -@@ -1187,7 +1187,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 + ipv6_push_frag_opts(skb, &opt.ops, &proto); } - /* Calculate max headroom for all the headers and adjust + skb_push(skb, sizeof(struct ipv6hdr)); -- cgit v1.2.3