diff options
| author |   Hannes Frederic Sowa <hannes@stressinduktion.org> | 2013-03-08 02:07:26 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-03-08 12:29:23 -0500 |
| commit | 3868b7aa76310d1d723d4db05c3526c908fb1e8b (patch) | |
| tree | c03dd6ad0af2b0a43e2c07de0ade9e1ae2ba0070 /net/ipv6/datagram.c | |
| parent | ipv6: use newly introduced __ipv6_addr_needs_scope_id and ipv6_iface_scope_id (diff) | |
| download | linux-dev-3868b7aa76310d1d723d4db05c3526c908fb1e8b.tar.xz linux-dev-3868b7aa76310d1d723d4db05c3526c908fb1e8b.zip | |
ipv6: report sin6_scope_id if sockopt RECVORIGDSTADDR is set
v4:
a) unchanged
Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/datagram.c')
| -rw-r--r-- | net/ipv6/datagram.c | 4 |
1 files changed, 3 insertions, 1 deletions
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); } |