diff --git a/[refs] b/[refs] index cb7aef3a315c..37b168e08973 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ab720881b6e36bd5190a3a11cee8d8d067c4ad7 +refs/heads/master: b60dfc6c20bd5f19de0083362ce377c89b1e5a24 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 4d2b5167d7f5..5b630cece707 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -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);