---

yaml --- r: 150759 b: refs/heads/master c: 4cf704f h: refs/heads/master i: 150757: 0a63ff6 150755: 7982660 150751: a8b1e25 v: v3
git-mirror · Jun 9, 2009 · 6caa2c9 · 6caa2c9
1 parent 799ae6f
commit 6caa2c9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b1a002ade68173f21b2126a778278df72202ba6
+refs/heads/master: 4cf704fbea96075942bd033fd75aa4e76ae1c8a1
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -1820,7 +1820,7 @@ int dev_queue_xmit(struct sk_buff *skb)
 	if (netif_needs_gso(dev, skb))
 		goto gso;
 
-	if (skb_shinfo(skb)->frag_list &&
+	if (skb_has_frags(skb) &&
 	    !(dev->features & NETIF_F_FRAGLIST) &&
 	    __skb_linearize(skb))
 		goto out_kfree_skb;
@@ -2407,7 +2407,7 @@ int dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
 	if (!(skb->dev->features & NETIF_F_GRO))
 		goto normal;
 
-	if (skb_is_gso(skb) || skb_shinfo(skb)->frag_list)
+	if (skb_is_gso(skb) || skb_has_frags(skb))
 		goto normal;
 
 	rcu_read_lock();