diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-03-26 05:19:25 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-26 05:19:25 -0400 |
commit | 789e41e6f496022ac1639aaae38ea1943606a9d0 (patch) | |
tree | 798425d92de538eab063e1fbfb49f7b29a7fb51c /net/ipv4 | |
parent | b34a95ee6e05579faff2672d7d30356576407653 (diff) |
[NETNS][ICMP]: Build fix for NET_NS=n case (dev->nd_net is omitted).
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/icmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index 7049b3f5f3cc..3697e0528317 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c | |||
@@ -821,7 +821,7 @@ static void icmp_echo(struct sk_buff *skb) | |||
821 | { | 821 | { |
822 | struct net *net; | 822 | struct net *net; |
823 | 823 | ||
824 | net = skb->dst->dev->nd_net; | 824 | net = dev_net(skb->dst->dev); |
825 | if (!net->ipv4.sysctl_icmp_echo_ignore_all) { | 825 | if (!net->ipv4.sysctl_icmp_echo_ignore_all) { |
826 | struct icmp_bxm icmp_param; | 826 | struct icmp_bxm icmp_param; |
827 | 827 | ||
@@ -1027,7 +1027,7 @@ int icmp_rcv(struct sk_buff *skb) | |||
1027 | if (rt->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST)) { | 1027 | if (rt->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST)) { |
1028 | struct net *net; | 1028 | struct net *net; |
1029 | 1029 | ||
1030 | net = rt->u.dst.dev->nd_net; | 1030 | net = dev_net(rt->u.dst.dev); |
1031 | /* | 1031 | /* |
1032 | * RFC 1122: 3.2.2.6 An ICMP_ECHO to broadcast MAY be | 1032 | * RFC 1122: 3.2.2.6 An ICMP_ECHO to broadcast MAY be |
1033 | * silently ignored (we let user decide with a sysctl). | 1033 | * silently ignored (we let user decide with a sysctl). |