From: Mark Huang <mlhuang@cs.princeton.edu> Date: Thu, 10 Feb 2005 19:39:16 +0000 (+0000) Subject: - check vnet_active before executing runtime vnet code X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~255 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7a7305e5445c01d89482fe34013d0f62f1d1e4f6;p=linux-2.6.git - check vnet_active before executing runtime vnet code --- diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index fa5b05c7e..5fc4935d1 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c @@ -1035,7 +1035,7 @@ int icmp_rcv(struct sk_buff *skb) #if defined(CONFIG_VNET) || defined(CONFIG_VNET_MODULE) /* VNET: Bypass stack if the echo ID was bound to a (presumably raw) socket */ - if (skb->sk) { + if (vnet_active && skb->sk) { switch (icmph->type) { case ICMP_ECHOREPLY: case ICMP_ECHO: