Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 789e41e6 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[NETNS][ICMP]: Build fix for NET_NS=n case (dev->nd_net is omitted). 



Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b34a95ee

net/ipv4/icmp.c

+2 −2
Original line number Diff line number Diff line
@@ -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).