Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index 82dc6b4..9e7f071 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3206,7 +3206,7 @@ int skb_checksum_help(struct sk_buff *skb)
        if (skb->ip_summed == CHECKSUM_COMPLETE)
                goto out_set_summed;
 
-       if (unlikely(skb_shinfo(skb)->gso_size)) {
+       if (unlikely(skb_is_gso(skb))) {
                skb_warn_bad_offload(skb);
                return -EINVAL;
        }