diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-07-15 02:01:40 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-15 02:05:26 -0400 |
commit | fd54d716b1f6a3551ec17a4bb34027727b2db09a (patch) | |
tree | c8afca51e9292740d3d2261e8a3f95e65a1135ee /net/ipv4/tcp_ipv4.c | |
parent | 0388b0042624714e6f8db8cc7994101a0a02d392 (diff) |
inet: toss struct net initialization around
Some places, that deal with ICMP statistics already have where
to get a struct net from, but use it directly, without declaring
a separate variable on the stack.
Since I will need this net soon, I declare a struct net on the
stack and use it in the existing places in a separate patch not
to spoil the future ones.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 4300bcf2ceaf..ca41b77f3f32 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -343,13 +343,14 @@ void tcp_v4_err(struct sk_buff *skb, u32 info) | |||
343 | struct sock *sk; | 343 | struct sock *sk; |
344 | __u32 seq; | 344 | __u32 seq; |
345 | int err; | 345 | int err; |
346 | struct net *net = dev_net(skb->dev); | ||
346 | 347 | ||
347 | if (skb->len < (iph->ihl << 2) + 8) { | 348 | if (skb->len < (iph->ihl << 2) + 8) { |
348 | ICMP_INC_STATS_BH(ICMP_MIB_INERRORS); | 349 | ICMP_INC_STATS_BH(ICMP_MIB_INERRORS); |
349 | return; | 350 | return; |
350 | } | 351 | } |
351 | 352 | ||
352 | sk = inet_lookup(dev_net(skb->dev), &tcp_hashinfo, iph->daddr, th->dest, | 353 | sk = inet_lookup(net, &tcp_hashinfo, iph->daddr, th->dest, |
353 | iph->saddr, th->source, inet_iif(skb)); | 354 | iph->saddr, th->source, inet_iif(skb)); |
354 | if (!sk) { | 355 | if (!sk) { |
355 | ICMP_INC_STATS_BH(ICMP_MIB_INERRORS); | 356 | ICMP_INC_STATS_BH(ICMP_MIB_INERRORS); |