diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-11-14 13:53:03 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-11-14 16:27:43 +0100 |
| commit | 7e20e4ab96ffc4d425fc3c6593a65d813f641fd1 (patch) | |
| tree | e5a8922efcd5dbceda05164f7736e2d89f6aeb49 /target/linux/generic/backport-4.9/094-v4.12-0001-ip6_tunnel-Fix-missing-tunnel-encapsulation-limit-op.patch | |
| parent | f7a406deafb4d2524f46a405d84a6d20c65022a9 (diff) | |
| download | upstream-7e20e4ab96ffc4d425fc3c6593a65d813f641fd1.tar.gz upstream-7e20e4ab96ffc4d425fc3c6593a65d813f641fd1.tar.bz2 upstream-7e20e4ab96ffc4d425fc3c6593a65d813f641fd1.zip | |
kernel: bump 4.9 to 4.9.137
Refreshed all patches.
Removed upstreamed hunks in:
- 703-phy-support-layerscape.patch
Compile-tested on: ar71xx, layerscape
Runtime-tested on: ar71xx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.9/094-v4.12-0001-ip6_tunnel-Fix-missing-tunnel-encapsulation-limit-op.patch')
| -rw-r--r-- | target/linux/generic/backport-4.9/094-v4.12-0001-ip6_tunnel-Fix-missing-tunnel-encapsulation-limit-op.patch | 4 |
1 files changed, 2 insertions, 2 deletions
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 <davem@davemloft.net> 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 <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)); |