Commit b60dfc6c authored Aug 01, 2006 by David S. Miller

[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>

parent 3ab72088

net/core/dev.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -1166,11 +1166,6 @@ int skb_checksum_help(struct sk_buff *skb, int inward)
		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 sk_buff skb, int features)
		__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);

Admin message