Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7db38c3 authored by YOSHIFUJI Hideaki / 吉藤英明's avatar YOSHIFUJI Hideaki / 吉藤英明 Committed by David S. Miller
Browse files

ipv6 sit: Fix 6rd relay address. 



ipv6 sit: Fix 6rd relay address.

Relay's address should be extracted from real IPv6 address
instead of configured prefix.

Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e0c93948

net/ipv6/sit.c

+2 −2
Original line number Diff line number Diff line
@@ -569,12 +569,12 @@ __be32 try_6rd(struct in6_addr *v6dst, struct ip_tunnel *tunnel) 
		pbw0 = tunnel->ip6rd.prefixlen >> 5;

		pbi0 = tunnel->ip6rd.prefixlen & 0x1f;



		d = (ntohl(tunnel->ip6rd.prefix.s6_addr32[pbw0]) << pbi0) >>

		d = (ntohl(v6dst->s6_addr32[pbw0]) << pbi0) >>

		    tunnel->ip6rd.relay_prefixlen;



		pbi1 = pbi0 - tunnel->ip6rd.relay_prefixlen;

		if (pbi1 > 0)

			d |= ntohl(tunnel->ip6rd.prefix.s6_addr32[pbw0 + 1]) >>

			d |= ntohl(v6dst->s6_addr32[pbw0 + 1]) >>

			     (32 - pbi1);



		dst = tunnel->ip6rd.relay_prefix | htonl(d);