Skip to contentSkip to conversation

IPv6: use ipv6_addr_v4mapped()

PATCH Applied Brian Haley 3 participants 3 messages Nov 9, 2009 – Nov 11, 2009

Subsystems (3)
Networking Network drivers UDP
lore
Share & tools
lore

Brian Haley

author
#0 lore raw

PATCH 1/1 IPv6: use ipv6_addr_v4mapped()

Change udp6_portaddr_hash() to use ipv6_addr_v4mapped() inline instead of ipv6_addr_type().

Signed-off-by Brian Haley <[email protected]>

---

net/ipv6/udp.c +1 -1
index 2915e1d..0ed1637 100644
@@ -89,7 +89,7 @@ static unsigned int udp6_portaddr_hash(struct net *net,
 
 	if (ipv6_addr_any(addr6))
 		hash = jhash_1word(0, mix);
-	else if (ipv6_addr_type(addr6) == IPV6_ADDR_MAPPED)
+	else if (ipv6_addr_v4mapped(addr6))
 		hash = jhash_1word(addr6->s6_addr32[3], mix);
 	else
 		hash = jhash2(addr6->s6_addr32, 4, mix);
Acked-by on v1 1/1
#1 lore raw
Quoted 11 lines · Brian Haley

Change udp6_portaddr_hash() to use ipv6_addr_v4mapped() inline instead of ipv6_addr_type().

Signed-off-by Brian Haley <[email protected]>

---

net/ipv6/udp.c +0 -0
index 2915e1d..0ed1637 100644

net/ipv6/udp.c static unsigned int udp6_portaddr_hash(struct net *net, · line 95

Quoted 8 lines
net/ipv6/udp.c +1 -1
@@ -89,7 +89,7 @@ static unsigned int udp6_portaddr_hash(struct net *net,
 
 	if (ipv6_addr_any(addr6))
 		hash = jhash_1word(0, mix);
-	else if (ipv6_addr_type(addr6) == IPV6_ADDR_MAPPED)
+	else if (ipv6_addr_v4mapped(addr6))
 		hash = jhash_1word(addr6->s6_addr32[3], mix);
 	else
 		hash = jhash2(addr6->s6_addr32, 4, mix);

Indeed, its a bit faster ;)

Acked-by Eric Dumazet <[email protected]>

Thanks Brian