--- linux/net/ipv4/icmp.c.printkfix	Thu Oct  7 15:53:56 1999
+++ linux/net/ipv4/icmp.c	Thu Oct  7 15:57:31 1999
@@ -699,7 +699,7 @@
 				break;
 			case ICMP_FRAG_NEEDED:
 				if (ipv4_config.no_pmtu_disc) {
-					if (sysctl_ip_always_defrag == 0 && net_ratelimit())
+					if (net_ratelimit())
 						printk(KERN_INFO "ICMP: %d.%d.%d.%d: fragmentation needed and DF set.\n",
 					       NIPQUAD(iph->daddr));
 				} else {
@@ -711,7 +711,7 @@
 				}
 				break;
 			case ICMP_SR_FAILED:
-				if (sysctl_ip_always_defrag == 0 && net_ratelimit())
+				if (net_ratelimit())
 					printk(KERN_INFO "ICMP: %d.%d.%d.%d: Source Route Failed.\n", NIPQUAD(iph->daddr));
 				break;
 			default:
@@ -924,7 +924,7 @@
 static void icmp_address(struct icmphdr *icmph, struct sk_buff *skb, int len)
 {
 #if 0
-	if (sysctl_ip_always_defrag == 0 && net_ratelimit())
+	if (net_ratelimit())
 		printk(KERN_DEBUG "a guy asks for address mask. Who is it?\n");
 #endif		
 }
@@ -954,7 +954,7 @@
 		if (mask == ifa->ifa_mask && inet_ifa_match(rt->rt_src, ifa))
 			return;
 	}
-	if (sysctl_ip_always_defrag == 0 && net_ratelimit())
+	if (net_ratelimit())
 		printk(KERN_INFO "Wrong address mask %08X from %08X/%s\n",
 		       ntohl(mask), ntohl(rt->rt_src), dev->name);
 }