dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Pavel Emelyanov 2008-07-16 20:28:42 -07:00 committed by David S. Miller
parent 5c52ba170f
commit ca12a1a443
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/dccp/ipv6.c
View File

@ -93,8 +93,9 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
struct sock *sk;
int err;
__u64 seq;
struct net *net = dev_net(skb->dev);
sk = inet6_lookup(dev_net(skb->dev), &dccp_hashinfo,
sk = inet6_lookup(net, &dccp_hashinfo,
&hdr->daddr, dh->dccph_dport,
&hdr->saddr, dh->dccph_sport, inet6_iif(skb));

3
net/ipv4/arp.c
View File

@ -421,8 +421,9 @@ static int arp_filter(__be32 sip, __be32 tip, struct net_device *dev)
struct rtable *rt;
int flag = 0;
/*unsigned long now; */
struct net *net = dev_net(dev);
if (ip_route_output_key(dev_net(dev), &rt, &fl) < 0)
if (ip_route_output_key(net, &rt, &fl) < 0)
return 1;
if (rt->u.dst.dev != dev) {
NET_INC_STATS_BH(LINUX_MIB_ARPFILTER);

3
net/ipv6/tcp_ipv6.c
View File

@ -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) {