Re-enable arbitrary IPv6 addresses as outer ip4-in-ip6 tunnel source address

[openwrt/staging/chunkeey.git] / target / linux / generic / pending-3.18 / 666-Add-support-for-MAP-E-FMRs-mesh-mode.patch

diff --git a/target/linux/generic/pending-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/target/linux/generic/pending-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
index 43bdbe456d9ddb8e8982b53afd0ac93816d9b212..3948d726b82a9bbb8f6e1ad22752f3218884d445 100644 (file)
--- a/target/linux/generic/pending-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
+++ b/target/linux/generic/pending-3.18/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
@@ -258,7 +258,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
                skb_reset_network_header(skb);
                skb->protocol = htons(protocol);
                memset(skb->cb, 0, sizeof(struct inet6_skb_parm));
-+              if (protocol == ETH_P_IP &&
++              if (protocol == ETH_P_IP && t->parms.fmrs &&
 +                      !ipv6_addr_equal(&ipv6h->saddr, &t->parms.raddr)) {
 +                              /* Packet didn't come from BR, so lookup FMR */
 +                              struct __ip6_tnl_fmr *fmr;