commit 3e4e4a201a117cc63dccec8f0358c7ac52704f9c
author Linux Build Service Account <lnxbuild@localhost> Thu Mar 13 20:31:37 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Mar 13 20:31:36 2014 -0700
tree 302025513241738de17bd3d38eb5725554a52077
parent 2f760bda23f45fafdd2136a09191c5286b14ef92
parent a1a354427bc17a6884bf097cf29aac4da7236da5

Merge "ping: always initialize ->sin6_scope_id and ->sin6_flowinfo"

net/ipv4/ping.c

diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 7f38d35..a8d7ed0 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -896,13 +896,13 @@
 		sin6->sin6_port = 0;
 		sin6->sin6_addr = ip6->saddr;
 
+		sin6->sin6_flowinfo = 0;
 		if (np->sndflow)
 			sin6->sin6_flowinfo =
 				*(__be32 *)ip6 & IPV6_FLOWINFO_MASK;
 
-		if (__ipv6_addr_needs_scope_id(
-		    ipv6_addr_type(&sin6->sin6_addr)))
-			sin6->sin6_scope_id = IP6CB(skb)->iif;
+		sin6->sin6_scope_id = ipv6_iface_scope_id(&sin6->sin6_addr,
+							  IP6CB(skb)->iif);
 
 		if (inet6_sk(sk)->rxopt.all)
 			pingv6_ops.datagram_recv_ctl(sk, msg, skb);