mirror of
https://github.com/torvalds/linux.git
synced 2024-11-16 09:02:00 +00:00
[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>
This commit is contained in:
parent
b34a95ee6e
commit
789e41e6f4
@ -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).
|
||||
|
Loading…
Reference in New Issue
Block a user