浏览代码

[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>
Pavel Emelyanov 17 年之前
父节点
当前提交
789e41e6f4
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      net/ipv4/icmp.c

+ 2 - 2
net/ipv4/icmp.c

@@ -821,7 +821,7 @@ static void icmp_echo(struct sk_buff *skb)
 {
 {
 	struct net *net;
 	struct net *net;
 
 
-	net = skb->dst->dev->nd_net;
+	net = dev_net(skb->dst->dev);
 	if (!net->ipv4.sysctl_icmp_echo_ignore_all) {
 	if (!net->ipv4.sysctl_icmp_echo_ignore_all) {
 		struct icmp_bxm icmp_param;
 		struct icmp_bxm icmp_param;
 
 
@@ -1027,7 +1027,7 @@ int icmp_rcv(struct sk_buff *skb)
 	if (rt->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST)) {
 	if (rt->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST)) {
 		struct net *net;
 		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
 		 *	RFC 1122: 3.2.2.6 An ICMP_ECHO to broadcast MAY be
 		 *	  silently ignored (we let user decide with a sysctl).
 		 *	  silently ignored (we let user decide with a sysctl).