diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-07-14 23:01:40 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-14 23:05:26 -0700 |
commit | fd54d716b1f6a3551ec17a4bb34027727b2db09a (patch) | |
tree | c8afca51e9292740d3d2261e8a3f95e65a1135ee /net/ipv4/icmp.c | |
parent | 0388b0042624714e6f8db8cc7994101a0a02d392 (diff) | |
download | linux-3.10-fd54d716b1f6a3551ec17a4bb34027727b2db09a.tar.gz linux-3.10-fd54d716b1f6a3551ec17a4bb34027727b2db09a.tar.bz2 linux-3.10-fd54d716b1f6a3551ec17a4bb34027727b2db09a.zip |
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/icmp.c')
-rw-r--r-- | net/ipv4/icmp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index 1ffe7add492..56d6b943345 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c @@ -973,6 +973,7 @@ int icmp_rcv(struct sk_buff *skb) { struct icmphdr *icmph; struct rtable *rt = skb->rtable; + struct net *net = dev_net(rt->u.dst.dev); if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) { int nh; @@ -1027,9 +1028,6 @@ int icmp_rcv(struct sk_buff *skb) */ if (rt->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST)) { - struct net *net; - - net = dev_net(rt->u.dst.dev); /* * RFC 1122: 3.2.2.6 An ICMP_ECHO to broadcast MAY be * silently ignored (we let user decide with a sysctl). |