ehea: Dont check NETIF_F_TSO in TX path
authorAnton Blanchard <anton@samba.org>
Fri, 14 Oct 2011 05:31:02 +0000 (05:31 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 17 Oct 2011 23:00:54 +0000 (19:00 -0400)
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>
drivers/net/ethernet/ibm/ehea/ehea_main.c

index 6ded42a965ac3ec9d2006b1551dc3dd51202a5aa..0cb3a9bc732d3933986dcfe1bf1dfa13036d33fb 100644 (file)
@@ -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);