X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=net%2Fipv4%2Ficmp.c;h=e3eceecd0496eeb752964ee276bdc2e0c79e4de3;hb=cbc749518235b0f1dacb867c8c25059a1b876276;hp=175e093ec5645209ab809dd52ccce0667a020e82;hpb=8caf89157d64f1eedba37113afb4b303b2b3e301;p=powerpc.git

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 175e093ec5..e3eceecd04 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -934,11 +934,11 @@ int icmp_rcv(struct sk_buff *skb)
 	case CHECKSUM_HW:
 		if (!(u16)csum_fold(skb->csum))
 			break;
-		LIMIT_NETDEBUG(KERN_DEBUG "icmp v4 hw csum failure\n");
+		/* fall through */
 	case CHECKSUM_NONE:
-		if ((u16)csum_fold(skb_checksum(skb, 0, skb->len, 0)))
+		skb->csum = 0;
+		if (__skb_checksum_complete(skb))
 			goto error;
-	default:;
 	}
 
 	if (!pskb_pull(skb, sizeof(struct icmphdr)))