diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-12 10:11:14 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-14 18:24:41 +0200 |
commit | e058fb36588157844355dc79f5a357b2bd207522 (patch) | |
tree | 4c9efea428d9741c5eacd9a179f19d32810b4620 /target/linux/generic/pending-4.9 | |
parent | 28dc34f249736d5dcb7ae5788ddcfa15874a7fc0 (diff) | |
download | upstream-e058fb36588157844355dc79f5a357b2bd207522.tar.gz upstream-e058fb36588157844355dc79f5a357b2bd207522.tar.bz2 upstream-e058fb36588157844355dc79f5a357b2bd207522.zip |
kernel: bump 4.9 to 4.9.189
Refreshed all patches.
Compile-tested on: ar71xx
Runtime-tested on: ar71xx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.9')
-rw-r--r-- | target/linux/generic/pending-4.9/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-4.9/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/target/linux/generic/pending-4.9/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch index af9a5b1914..9979c22fc3 100644 --- a/target/linux/generic/pending-4.9/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch +++ b/target/linux/generic/pending-4.9/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch @@ -308,9 +308,9 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org> int encap_limit = -1; __u16 offset; struct flowi6 fl6; -@@ -1362,6 +1503,18 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str - fl6.flowi6_mark = skb->mark; - } +@@ -1364,6 +1505,18 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str + + dsfield = INET_ECN_encapsulate(dsfield, ipv6_get_dsfield(ipv6h)); + /* try to find matching FMR */ + for (fmr = t->parms.fmrs; fmr; fmr = fmr->next) { |