summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorPavel Emelyanov2008-01-31 14:07:21 +0100
committerDavid S. Miller2008-02-01 04:28:20 +0100
commitd86e0dac2ce412715181f792aa0749fe3effff11 (patch)
treebc9197a7316c7d7641112d5f5975d8b91afdbd08 /net/ipv4
parent[NETNS]: Tcp-v4 sockets per-net lookup. (diff)
downloadkernel-qcow2-linux-d86e0dac2ce412715181f792aa0749fe3effff11.tar.gz
kernel-qcow2-linux-d86e0dac2ce412715181f792aa0749fe3effff11.tar.xz
kernel-qcow2-linux-d86e0dac2ce412715181f792aa0749fe3effff11.zip
[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.c2
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,
}
#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
else if (req->idiag_family == AF_INET6) {
- sk = inet6_lookup(hashinfo,
+ sk = inet6_lookup(&init_net, hashinfo,
(struct in6_addr *)req->id.idiag_dst,
req->id.idiag_dport,
(struct in6_addr *)req->id.idiag_src,