From 83d86b9521957e0112401b9bc5ff97d31d9e43cf Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Fri, 14 Oct 2011 05:31:02 +0000 Subject: [PATCH] --- yaml --- r: 266817 b: refs/heads/master c: 921ddc19b91ed92ce9485e46a147a0a49fabc69c h: refs/heads/master i: 266815: dbac025f34cda9fc503c4d50574a9a491dbeb8cf v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e6bb431557c2..c6e47eaa55a1 100644 --- 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 index 6ded42a965ac..0cb3a9bc732d 100644 --- 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);