From 220ab4156faafa3b5f8eac90e9a24e692fbdee62 Mon Sep 17 00:00:00 2001 From: Vladislav Zolotarov Date: Sun, 28 Nov 2010 00:23:35 +0000 Subject: [PATCH] --- yaml --- r: 224509 b: refs/heads/master c: 5892b9e9ebdde50fbd524570d61ceb74f8be33f3 h: refs/heads/master i: 224507: cf7c099726063ce7d673700d3feffde2140a8f5e v: v3 --- [refs] | 2 +- trunk/drivers/net/bnx2x/bnx2x_cmn.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d5143e3acc77..4d50d16e08f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be7ff1afec25f2700ca85e3956a2cb3a7b74acd5 +refs/heads/master: 5892b9e9ebdde50fbd524570d61ceb74f8be33f3 diff --git a/trunk/drivers/net/bnx2x/bnx2x_cmn.c b/trunk/drivers/net/bnx2x/bnx2x_cmn.c index 94d5f59d5a6f..e20b2d378929 100644 --- a/trunk/drivers/net/bnx2x/bnx2x_cmn.c +++ b/trunk/drivers/net/bnx2x/bnx2x_cmn.c @@ -1692,11 +1692,10 @@ static inline u32 bnx2x_xmit_type(struct bnx2x *bp, struct sk_buff *skb) } } - if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV4) - rc |= (XMIT_GSO_V4 | XMIT_CSUM_V4 | XMIT_CSUM_TCP); - - else if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6) - rc |= (XMIT_GSO_V6 | XMIT_CSUM_TCP | XMIT_CSUM_V6); + if (skb_is_gso_v6(skb)) + rc |= XMIT_GSO_V6 | XMIT_CSUM_TCP | XMIT_CSUM_V6; + else if (skb_is_gso(skb)) + rc |= XMIT_GSO_V4 | XMIT_CSUM_V4 | XMIT_CSUM_TCP; return rc; }