summaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorPavel Emelyanov2008-07-17 05:28:42 +0200
committerDavid S. Miller2008-07-17 05:28:42 +0200
commitca12a1a443a51298afcca627ad0bcbd8ad1dcddc (patch)
tree9eebfe3f3b5812ea524d0b32223fb622a8d12bc8 /net/ipv6
parentsock: add net to prot->enter_memory_pressure callback (diff)
downloadkernel-qcow2-linux-ca12a1a443a51298afcca627ad0bcbd8ad1dcddc.tar.gz
kernel-qcow2-linux-ca12a1a443a51298afcca627ad0bcbd8ad1dcddc.tar.xz
kernel-qcow2-linux-ca12a1a443a51298afcca627ad0bcbd8ad1dcddc.zip
inet: prepare net on the stack for NET accounting macros
Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/tcp_ipv6.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 3895d91ea9fa..d58b83ac06fb 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -323,8 +323,9 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
int err;
struct tcp_sock *tp;
__u32 seq;
+ struct net *net = dev_net(skb->dev);
- sk = inet6_lookup(dev_net(skb->dev), &tcp_hashinfo, &hdr->daddr,
+ sk = inet6_lookup(net, &tcp_hashinfo, &hdr->daddr,
th->dest, &hdr->saddr, th->source, skb->dev->ifindex);
if (sk == NULL) {