diff options
| author | Luka Perkov <luka@openwrt.org> | 2016-05-10 22:36:30 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2016-06-19 19:28:16 +0200 |
| commit | 66ffd4817b2f5029fd3cfd10be0ecb1aca505493 (patch) | |
| tree | 65376a8277c4075155a8c8dc1acb69f7ac3bbb14 | |
| parent | 66e6517d6526207d816fdd78d5f7c30a0f7d354e (diff) | |
| download | master-187ad058-66ffd4817b2f5029fd3cfd10be0ecb1aca505493.tar.gz master-187ad058-66ffd4817b2f5029fd3cfd10be0ecb1aca505493.tar.bz2 master-187ad058-66ffd4817b2f5029fd3cfd10be0ecb1aca505493.zip | |
kernel: fix ip6_tunnel compilation
Replace undefined iph for ip_hdr(skb)
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@49328 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/generic/patches-4.4/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch | 4 |
1 files changed, 2 insertions, 2 deletions
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) { |