aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-12-09 23:29:52 +0000
committerLuka Perkov <luka@openwrt.org>2014-12-09 23:29:52 +0000
commitfd492354bb9e920837e241894e4370698644b856 (patch)
treef91dd8063e6f0a23423cd3b415f87ec6e2fe9002 /target/linux/generic/patches-3.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
parent3b1762539427ef87c7463d9eab67500220571232 (diff)
downloadupstream-fd492354bb9e920837e241894e4370698644b856.tar.gz
upstream-fd492354bb9e920837e241894e4370698644b856.tar.bz2
upstream-fd492354bb9e920837e241894e4370698644b856.zip
kernel: refresh patches
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 43591
Diffstat (limited to 'target/linux/generic/patches-3.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch')
-rw-r--r--target/linux/generic/patches-3.14/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.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/target/linux/generic/patches-3.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
index ab8d9688fd..c7126dad25 100644
--- a/target/linux/generic/patches-3.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
+++ b/target/linux/generic/patches-3.14/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. */
-@@ -1257,6 +1407,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
+@@ -1257,6 +1407,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
t->parms.flowinfo = p->flowinfo;
t->parms.link = p->link;
t->parms.proto = p->proto;