diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-12 10:10:44 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-14 18:23:08 +0200 |
| commit | c141508525519136f8c5b80e521b7072f8b46789 (patch) | |
| tree | 62903d3697fef74b2cbfb39bc51c4e2aaf688efd /target/linux/generic/pending-4.9/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch | |
| parent | b133e466b08e25ea59be9108de5f262f7eff49a6 (diff) | |
| download | upstream-c141508525519136f8c5b80e521b7072f8b46789.tar.gz upstream-c141508525519136f8c5b80e521b7072f8b46789.tar.bz2 upstream-c141508525519136f8c5b80e521b7072f8b46789.zip | |
kernel: bump 4.9 to 4.9.189
Refreshed all patches.
Compile-tested on: none
Runtime-tested on: none
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.9/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch')
| -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) { |