X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=net%2Fipv6%2Fdatagram.c;h=4b56cbbc789062d89c5a708386a03e5a8ded8bc6;hp=b55e70add93ccee04419a6ad650ea33463e04cba;hb=3868b7aa76310d1d723d4db05c3526c908fb1e8b;hpb=842df0739776fc9af7ac15968b44415a31ba9be4

diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index b55e70add93c..4b56cbbc7890 100644
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -594,7 +594,9 @@ int ip6_datagram_recv_ctl(struct sock *sk, struct msghdr *msg,
 			sin6.sin6_addr = ipv6_hdr(skb)->daddr;
 			sin6.sin6_port = ports[1];
 			sin6.sin6_flowinfo = 0;
-			sin6.sin6_scope_id = 0;
+			sin6.sin6_scope_id =
+				ipv6_iface_scope_id(&ipv6_hdr(skb)->daddr,
+						    opt->iif);
 
 			put_cmsg(msg, SOL_IPV6, IPV6_ORIGDSTADDR, sizeof(sin6), &sin6);
 		}