direct-io.hg
annotate patches/linux-2.6.16.33/net-gso-4-kill-warnon.patch @ 12988:e080700efa56
[TOOLS] Fix the build. Clearly demarcate PPC-specific stuff.
Signed-off-by: Keir Fraser <keir@xensource.com>
Signed-off-by: Keir Fraser <keir@xensource.com>
author | kfraser@localhost.localdomain |
---|---|
date | Wed Dec 13 10:23:53 2006 +0000 (2006-12-13) |
parents | 6c2c7ff6265a |
children |
rev | line source |
---|---|
ian@12592 | 1 diff -pruN ../orig-linux-2.6.16.29/net/core/dev.c ./net/core/dev.c |
ian@12592 | 2 --- ../orig-linux-2.6.16.29/net/core/dev.c 2006-09-19 13:59:46.000000000 +0100 |
ian@12592 | 3 +++ ./net/core/dev.c 2006-09-19 14:05:32.000000000 +0100 |
ian@12592 | 4 @@ -1087,11 +1087,6 @@ int skb_checksum_help(struct sk_buff *sk |
ian@12592 | 5 goto out_set_summed; |
ian@12592 | 6 |
ian@12592 | 7 if (unlikely(skb_shinfo(skb)->gso_size)) { |
ian@12592 | 8 - static int warned; |
ian@12592 | 9 - |
ian@12592 | 10 - WARN_ON(!warned); |
ian@12592 | 11 - warned = 1; |
ian@12592 | 12 - |
ian@12592 | 13 /* Let GSO fix up the checksum. */ |
ian@12592 | 14 goto out_set_summed; |
ian@12592 | 15 } |
ian@12592 | 16 @@ -1141,11 +1136,6 @@ struct sk_buff *skb_gso_segment(struct s |
ian@12592 | 17 __skb_pull(skb, skb->mac_len); |
ian@12592 | 18 |
ian@12592 | 19 if (unlikely(skb->ip_summed != CHECKSUM_HW)) { |
ian@12592 | 20 - static int warned; |
ian@12592 | 21 - |
ian@12592 | 22 - WARN_ON(!warned); |
ian@12592 | 23 - warned = 1; |
ian@12592 | 24 - |
ian@12592 | 25 if (skb_header_cloned(skb) && |
ian@12592 | 26 (err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC))) |
ian@12592 | 27 return ERR_PTR(err); |