diff options
author | Luka Perkov <luka@openwrt.org> | 2014-12-09 23:29:52 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2014-12-09 23:29:52 +0000 |
commit | 2a2cefc30a135a4c4c9ba5877a12b4fa39cf5f35 (patch) | |
tree | f5238a4e0730e17906a9600ba2053405235779e0 /target/linux/generic/patches-3.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch | |
parent | 350c6a0435f03e916577ffe02ef3a98c3166b57e (diff) | |
download | master-187ad058-2a2cefc30a135a4c4c9ba5877a12b4fa39cf5f35.tar.gz master-187ad058-2a2cefc30a135a4c4c9ba5877a12b4fa39cf5f35.tar.bz2 master-187ad058-2a2cefc30a135a4c4c9ba5877a12b4fa39cf5f35.zip |
kernel: refresh patches
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43591 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 2 |
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; |