diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-10-24 20:39:36 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-10-24 20:39:36 +0000 |
| commit | 7004b796658fe274026925f96fd3a6711e8a3f5d (patch) | |
| tree | f455fb3d2062fd4ca23142c39ca96ea5e2d407fb /target/linux/generic/patches-3.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch | |
| parent | 0aca075a9795780062a0b1821e799cd8b1cd5111 (diff) | |
| download | upstream-7004b796658fe274026925f96fd3a6711e8a3f5d.tar.gz upstream-7004b796658fe274026925f96fd3a6711e8a3f5d.tar.bz2 upstream-7004b796658fe274026925f96fd3a6711e8a3f5d.zip | |
kernel: refresh generic 3.10 patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 43050
Diffstat (limited to 'target/linux/generic/patches-3.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch')
| -rw-r--r-- | target/linux/generic/patches-3.10/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.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/target/linux/generic/patches-3.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch index a8ab127b35..783a421b2f 100644 --- a/target/linux/generic/patches-3.10/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch +++ b/target/linux/generic/patches-3.10/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. */ -@@ -1245,6 +1395,14 @@ ip6_tnl_change(struct ip6_tnl *t, const +@@ -1245,6 +1395,14 @@ ip6_tnl_change(struct ip6_tnl *t, const t->parms.flowinfo = p->flowinfo; t->parms.link = p->link; t->parms.proto = p->proto; |