summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-12-01 17:38:54 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-12-01 17:38:54 +0000
commitd1c0a65266b0bbfbe2839f3f5401e09ab9eb7664 (patch)
tree79b063a7c43e138a404575365ae614c85477ccd3 /target/linux/generic/patches-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
parent70c3a60947cc0b000a4174e65206fe89cb43c7ae (diff)
downloadmtk-20170518-d1c0a65266b0bbfbe2839f3f5401e09ab9eb7664.zip
mtk-20170518-d1c0a65266b0bbfbe2839f3f5401e09ab9eb7664.tar.gz
mtk-20170518-d1c0a65266b0bbfbe2839f3f5401e09ab9eb7664.tar.bz2
kernel: update 3.18 to rc7
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43479
Diffstat (limited to 'target/linux/generic/patches-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch')
-rw-r--r--target/linux/generic/patches-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/target/linux/generic/patches-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
index 000665f..8bf4b3b 100644
--- a/target/linux/generic/patches-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
+++ b/target/linux/generic/patches-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
@@ -308,7 +308,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
err = ip6_tnl_xmit2(skb, dev, dsfield, &fl6, encap_limit, &mtu);
if (err != 0) {
/* XXX: send ICMP error even if DF is not set. */
-@@ -1263,6 +1413,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
+@@ -1263,6 +1413,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
t->parms.flowinfo = p->flowinfo;
t->parms.link = p->link;
t->parms.proto = p->proto;