From: Brian Haley <brian.haley@hp.com>
Date: Mon, 9 Nov 2009 12:05:53 +0000 (+0000)
Subject: IPv6: use ipv6_addr_v4mapped()
X-Git-Tag: Ubuntu-5.2.0-15.16~27021^2~424
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=856540ee3116ac04a49bc06c2f30f54dd3faf7db;p=mirror_ubuntu-eoan-kernel.git

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 <brian.haley@hp.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index f4c85b200051..69ebdbe78c47 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -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);