diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-12-01 17:38:54 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-12-01 17:38:54 +0000 |
| commit | a91376dac1634f849b2235372361cf4b88063dd4 (patch) | |
| tree | ba8344bdc6a700f7460169593d4db72dfd877cf6 /target/linux/generic/patches-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch | |
| parent | 0778adf28a0ffe9566602e3af097bf3b995ec75f (diff) | |
| download | master-187ad058-a91376dac1634f849b2235372361cf4b88063dd4.tar.gz master-187ad058-a91376dac1634f849b2235372361cf4b88063dd4.tar.bz2 master-187ad058-a91376dac1634f849b2235372361cf4b88063dd4.zip | |
kernel: update 3.18 to rc7
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43479 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.patch | 2 |
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 000665f047..8bf4b3b294 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; |