diff --git a/[refs] b/[refs]
index a48553f1c800..0c983281102a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee0398717078260ee4ffa97d407071bc774e2dac
+refs/heads/master: a5bd8a13e9e0322c7f76b34790ba34e2e0ce2ac5
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index 2a801380b502..9ea8d6dfe540 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -1904,7 +1904,7 @@ static inline int net_gso_ok(int features, int gso_type)
 static inline int skb_gso_ok(struct sk_buff *skb, int features)
 {
 	return net_gso_ok(features, skb_shinfo(skb)->gso_type) &&
-	       (!skb_shinfo(skb)->frag_list || (features & NETIF_F_FRAGLIST));
+	       (!skb_has_frags(skb) || (features & NETIF_F_FRAGLIST));
 }
 
 static inline int netif_needs_gso(struct net_device *dev, struct sk_buff *skb)