---

yaml --- r: 266817 b: refs/heads/master c: 921ddc1 h: refs/heads/master i: 266815: dbac025 v: v3
git-mirror · Oct 17, 2011 · 83d86b9 · 83d86b9
1 parent ecc0df5
commit 83d86b9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 723f28e49c9f8578b418dfd1ec8c7b9cc13e2b63
+refs/heads/master: 921ddc19b91ed92ce9485e46a147a0a49fabc69c
diff --git a/trunk/drivers/net/ethernet/ibm/ehea/ehea_main.c b/trunk/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -1787,7 +1787,7 @@ static inline void write_swqe2_data(struct sk_buff *skb, struct net_device *dev,
 	swqe->descriptors = 0;
 	sg1entry_contains_frag_data = 0;
 
-	if ((dev->features & NETIF_F_TSO) && skb_shinfo(skb)->gso_size)
+	if (skb_is_gso(skb))
 		write_swqe2_TSO(skb, swqe, lkey);
 	else
 		write_swqe2_nonTSO(skb, swqe, lkey);