diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-01-31 08:07:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-31 22:28:20 -0500 |
commit | d86e0dac2ce412715181f792aa0749fe3effff11 (patch) | |
tree | bc9197a7316c7d7641112d5f5975d8b91afdbd08 /net/ipv4 | |
parent | c67499c0e772064b37ad75eb69b28fc218752636 (diff) |
[NETNS]: Tcp-v6 sockets per-net lookup.
Add a net argument to inet6_lookup and propagate it further.
Actually, this is tcp-v6 implementation of what was done for
tcp-v4 sockets in a previous patch.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/inet_diag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c index 95c9f1429228..da97695e7096 100644 --- a/net/ipv4/inet_diag.c +++ b/net/ipv4/inet_diag.c | |||
@@ -274,7 +274,7 @@ static int inet_diag_get_exact(struct sk_buff *in_skb, | |||
274 | } | 274 | } |
275 | #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) | 275 | #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) |
276 | else if (req->idiag_family == AF_INET6) { | 276 | else if (req->idiag_family == AF_INET6) { |
277 | sk = inet6_lookup(hashinfo, | 277 | sk = inet6_lookup(&init_net, hashinfo, |
278 | (struct in6_addr *)req->id.idiag_dst, | 278 | (struct in6_addr *)req->id.idiag_dst, |
279 | req->id.idiag_dport, | 279 | req->id.idiag_dport, |
280 | (struct in6_addr *)req->id.idiag_src, | 280 | (struct in6_addr *)req->id.idiag_src, |