diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-01-15 12:56:22 +0100 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-01-16 12:56:30 +0100 |
commit | 63a2ed3ba5bca13db3029e6eb8aa0c35872b73b9 (patch) | |
tree | 9e1ab8b617c8135c9702a084d8698bd26e4329fa /target/linux/generic/backport-4.9/094-v4.12-0001-ip6_tunnel-Fix-missing-tunnel-encapsulation-limit-op.patch | |
parent | 5be22ef2faad0cfb26ee38fe589c791c67444533 (diff) | |
download | upstream-63a2ed3ba5bca13db3029e6eb8aa0c35872b73b9.tar.gz upstream-63a2ed3ba5bca13db3029e6eb8aa0c35872b73b9.tar.bz2 upstream-63a2ed3ba5bca13db3029e6eb8aa0c35872b73b9.zip |
kernel: bump 4.9 to 4.9.150
Refreshed all patches.
Remove upstreamed:
- 096-mips-math-emu-Write-protect-delay-slot-emulation-pages.patch
Altered patches:
- 024-7-net-reorganize-struct-sock-for-better-data-locality.patch
Compile-tested on: ar7
Runtime-tested on: none
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 136fdf48d3..7c3c5608c5 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 @@ -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; } -@@ -1199,7 +1199,7 @@ route_lookup: +@@ -1200,7 +1200,7 @@ route_lookup: if (encap_limit >= 0) { init_tel_txopt(&opt, encap_limit); |