aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-04-19 11:38:46 +0000
committerJonas Gorski <jogo@openwrt.org>2015-04-19 11:38:46 +0000
commit025b5cf8bdea775b87a19b80c3a4c8e3b19beec9 (patch)
treea4ceeb440e0607a889a5403d4cff15b9664dbd56 /target/linux/generic/patches-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
parent1da88fdb3e0344c56d40f7ad69ca153a289d9a27 (diff)
downloadmaster-187ad058-025b5cf8bdea775b87a19b80c3a4c8e3b19beec9.tar.gz
master-187ad058-025b5cf8bdea775b87a19b80c3a4c8e3b19beec9.tar.bz2
master-187ad058-025b5cf8bdea775b87a19b80c3a4c8e3b19beec9.zip
kernel: refresh generic patches
Refresh patches to remove the trailing whitespaces caused by an old diffutils version on osx. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45506 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 8bf4b3b294..000665f047 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;