summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/ibm
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2011-10-14 05:31:02 +0000
committerDavid S. Miller <davem@davemloft.net>2011-10-17 19:00:54 -0400
commit921ddc19b91ed92ce9485e46a147a0a49fabc69c (patch)
treef06cdfabd8ae07846780f37e865430caeede2c85 /drivers/net/ethernet/ibm
parent723f28e49c9f8578b418dfd1ec8c7b9cc13e2b63 (diff)
downloadlinux-921ddc19b91ed92ce9485e46a147a0a49fabc69c.tar.gz
linux-921ddc19b91ed92ce9485e46a147a0a49fabc69c.tar.bz2
linux-921ddc19b91ed92ce9485e46a147a0a49fabc69c.zip
ehea: Dont check NETIF_F_TSO in TX path
It seems like the ehea xmit routine and an ethtool change of TSO mode could race, resulting in corrupt packets. Checking gso_size is enough and we can use the helper function. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ibm')
-rw-r--r--drivers/net/ethernet/ibm/ehea/ehea_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index 6ded42a965ac..0cb3a9bc732d 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/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);