diff --git a/[refs] b/[refs]
index b9b81af8744b..80c293f7c1f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 246c65add098a5ec14310ea17f39fdd57ff8407d
+refs/heads/master: 856540ee3116ac04a49bc06c2f30f54dd3faf7db
diff --git a/trunk/net/ipv6/udp.c b/trunk/net/ipv6/udp.c
index f4c85b200051..69ebdbe78c47 100644
--- a/trunk/net/ipv6/udp.c
+++ b/trunk/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);