Re: BUG: warning at net/core/dev.c:1171/skb_checksum_help() 2.6.18-rc3

[David Miller <davem@davemloft.net>]

From: Patrick McHardy <kaber@trash.net>
Date: Mon, 31 Jul 2006 20:36:58 +0200

> Herbert Xu wrote:
> > So I'd rather see a patch to disable the warnings for 2.6.18 so that
> > the proper fix can be tested more thoroughly.  We should remember that
> > the 2.6.18 minus the warning is still going to be heaps better in this
> > regard compared to 2.6.17 where all TSO packets were essentially
> > discarded due to the incorrect checksum (when the NAT module is loaded).
> 
> I'm fine either way.

I'm going to kill the warning for 2.6.18, using the patch below.
We can queue up Patrick's changes for 2.6.19, just give me the
word and I'll apply it to net-2.6.19

commit 9133d3d0619e637f2e05bf574af4b7a16319e3ca
Author: David S. Miller <davem@sunset.davemloft.net>
Date:   Tue Aug 1 00:00:12 2006 -0700

    [NET]: Kill the WARN_ON() calls for checksum fixups.
    
    We have a more complete solution in the works, involving
    the seperation of CHECKSUM_HW on input vs. output, and
    having netfilter properly do incremental checksums.
    
    But that is a very involved patch and is thus 2.6.19
    material.
    
    What we have now is infinitely better than the past,
    wherein all TSO packets were dropped due to corrupt
    checksums as soon at the NAT module was loaded.  At
    least now, the checksums do get fixed up, it just
    isn't the cleanest nor most optimal solution.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/dev.c b/net/core/dev.c
index 4d2b516..5b630ce 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1166,11 +1166,6 @@ int skb_checksum_help(struct sk_buff *sk
 		goto out_set_summed;
 
 	if (unlikely(skb_shinfo(skb)->gso_size)) {
-		static int warned;
-
-		WARN_ON(!warned);
-		warned = 1;
-
 		/* Let GSO fix up the checksum. */
 		goto out_set_summed;
 	}
@@ -1220,11 +1215,6 @@ struct sk_buff *skb_gso_segment(struct s
 	__skb_pull(skb, skb->mac_len);
 
 	if (unlikely(skb->ip_summed != CHECKSUM_HW)) {
-		static int warned;
-
-		WARN_ON(!warned);
-		warned = 1;
-
 		if (skb_header_cloned(skb) &&
 		    (err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC)))
 			return ERR_PTR(err);