From 33ba7cd3cf4fb6554673cc46cd325c6ce48198e0 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Wed, 26 Mar 2008 02:19:25 -0700 Subject: [PATCH] --- yaml --- r: 90405 b: refs/heads/master c: 789e41e6f496022ac1639aaae38ea1943606a9d0 h: refs/heads/master i: 90403: 5edd63c09438bed58fd90e3139ae247baf4a572d v: v3 --- [refs] | 2 +- trunk/net/ipv4/icmp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5c19048e4df8..2764a1c2abcc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b34a95ee6e05579faff2672d7d30356576407653 +refs/heads/master: 789e41e6f496022ac1639aaae38ea1943606a9d0 diff --git a/trunk/net/ipv4/icmp.c b/trunk/net/ipv4/icmp.c index 7049b3f5f3cc..3697e0528317 100644 --- a/trunk/net/ipv4/icmp.c +++ b/trunk/net/ipv4/icmp.c @@ -821,7 +821,7 @@ static void icmp_echo(struct sk_buff *skb) { struct net *net; - net = skb->dst->dev->nd_net; + net = dev_net(skb->dst->dev); if (!net->ipv4.sysctl_icmp_echo_ignore_all) { struct icmp_bxm icmp_param; @@ -1027,7 +1027,7 @@ int icmp_rcv(struct sk_buff *skb) if (rt->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST)) { struct net *net; - net = rt->u.dst.dev->nd_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).