summaryrefslogtreecommitdiffstats
path: root/net/dccp/ipv4.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-07-14 23:01:40 -0700
committerDavid S. Miller <davem@davemloft.net>2008-07-14 23:05:26 -0700
commitfd54d716b1f6a3551ec17a4bb34027727b2db09a (patch)
treec8afca51e9292740d3d2261e8a3f95e65a1135ee /net/dccp/ipv4.c
parent0388b0042624714e6f8db8cc7994101a0a02d392 (diff)
downloadop-kernel-dev-fd54d716b1f6a3551ec17a4bb34027727b2db09a.zip
op-kernel-dev-fd54d716b1f6a3551ec17a4bb34027727b2db09a.tar.gz
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/dccp/ipv4.c')
-rw-r--r--net/dccp/ipv4.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 37d27bc..cc4f334 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -205,13 +205,14 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info)
struct sock *sk;
__u64 seq;
int err;
+ struct net *net = dev_net(skb->dev);
if (skb->len < (iph->ihl << 2) + 8) {
ICMP_INC_STATS_BH(ICMP_MIB_INERRORS);
return;
}
- sk = inet_lookup(dev_net(skb->dev), &dccp_hashinfo,
+ sk = inet_lookup(net, &dccp_hashinfo,
iph->daddr, dh->dccph_dport,
iph->saddr, dh->dccph_sport, inet_iif(skb));
if (sk == NULL) {
OpenPOWER on IntegriCloud