From: Luka Perkov <luka@openwrt.org>
Date: Tue, 10 May 2016 22:36:30 +0000 (+0000)
Subject: kernel: fix ip6_tunnel compilation
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=111d7792a1a5af9ce7b154992567f07925edc712;p=openwrt%2Fsvn-archive%2Farchive.git

kernel: fix ip6_tunnel compilation

Replace undefined iph for ip_hdr(skb)

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

SVN-Revision: 49328
---

diff --git a/target/linux/generic/patches-4.4/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch b/target/linux/generic/patches-4.4/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
index 7123c80646..d511520dea 100644
--- a/target/linux/generic/patches-4.4/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
+++ b/target/linux/generic/patches-4.4/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
@@ -311,13 +311,13 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
 +	for (fmr = t->parms.fmrs; fmr; fmr = fmr->next) {
 +		unsigned mshift = 32 - fmr->ip4_prefix_len;
 +		if (ntohl(fmr->ip4_prefix.s_addr) >> mshift ==
-+				ntohl(iph->daddr) >> mshift)
++				ntohl(ip_hdr(skb)->daddr) >> mshift)
 +			break;
 +	}
 +
 +	/* change dstaddr according to FMR */
 +	if (fmr)
-+		ip4ip6_fmr_calc(&fl6.daddr, iph, skb_tail_pointer(skb), fmr, true);
++		ip4ip6_fmr_calc(&fl6.daddr, ip_hdr(skb), skb_tail_pointer(skb), fmr, true);
 +
  	err = ip6_tnl_xmit2(skb, dev, dsfield, &fl6, encap_limit, &mtu);
  	if (err != 0) {