diff options
author | Maciej Żenczykowski <maze@google.com> | 2011-08-28 14:35:31 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-08-30 23:39:01 +0200 |
commit | ec0506dbe4e240ecd4c32bf74c84a88ce1ddb414 (patch) | |
tree | d8eb6a77c2f611d99a8c8b6576389c071bf5890a /net/ipv6/ipv6_sockglue.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | linux-ec0506dbe4e240ecd4c32bf74c84a88ce1ddb414.tar.xz linux-ec0506dbe4e240ecd4c32bf74c84a88ce1ddb414.zip |
net: relax PKTINFO non local ipv6 udp xmit check
Allow transparent sockets to be less restrictive about
the source ip of ipv6 udp packets being sent.
Google-Bug-Id: 5018138
Signed-off-by: Maciej Żenczykowski <maze@google.com>
CC: "Erik Kline" <ek@google.com>
CC: "Lorenzo Colitti" <lorenzo@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ipv6_sockglue.c')
-rw-r--r-- | net/ipv6/ipv6_sockglue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index 147ede38ab48..2fbda5fc4cc4 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c @@ -475,7 +475,7 @@ sticky_done: msg.msg_controllen = optlen; msg.msg_control = (void*)(opt+1); - retv = datagram_send_ctl(net, &msg, &fl6, opt, &junk, &junk, + retv = datagram_send_ctl(net, sk, &msg, &fl6, opt, &junk, &junk, &junk); if (retv) goto done; |