X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fipv4%2Ficmp.c;h=241fbc1fc6878ba8b7f4fd32005acb2a70def34c;hb=6f71f83334a552167ccbbd42fe5dd979428c89e4;hp=5fc4935d1b18d098315941cd5d4555816a4dad57;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 5fc4935d1..241fbc1fc 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -338,8 +338,6 @@ int icmp_glue_bits(void *from, char *to, int offset, int len, int odd,
 				      to, len, 0);
 
 	skb->csum = csum_block_add(skb->csum, csum, odd);
-	if (icmp_pointers[icmp_param->data.icmph.type].error)
-		nf_ct_attach(skb, icmp_param->skb);
 	return 0;
 }
 
@@ -1033,23 +1031,6 @@ 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 (vnet_active && skb->sk) {
-		switch (icmph->type) {
-		case ICMP_ECHOREPLY:
-		case ICMP_ECHO:
-		case ICMP_TIMESTAMP:
-		case ICMP_TIMESTAMPREPLY:
-		case ICMP_INFO_REQUEST:
-		case ICMP_INFO_REPLY:
-		case ICMP_ADDRESS:
-		case ICMP_ADDRESSREPLY:
-			goto drop;
-		}
-	}
-#endif
-
 	ICMP_INC_STATS_BH(icmp_pointers[icmph->type].input_entry);
 	icmp_pointers[icmph->type].handler(skb);