From e253feeafd2e94b8bf9141e1ac58f8b6837cebd1 Mon Sep 17 00:00:00 2001 From: Matt Carlson Date: Wed, 15 Sep 2010 08:59:59 +0000 Subject: [PATCH] --- yaml --- r: 214529 b: refs/heads/master c: 02e96080af2b70313f2ffc8c1b03ae2f9d8c65ac h: refs/heads/master i: 214527: 28ce22c8619e065e2e1eaf3035bfb9fea95a688d v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e5ecea32162d..54845f9fa3a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8fea32b9555726d35b91492d17fc21c7874d36f9 +refs/heads/master: 02e96080af2b70313f2ffc8c1b03ae2f9d8c65ac diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index 179eb6539bd0..a4fbe4f85ffe 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -5574,9 +5574,9 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, goto out_unlock; } - if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6) + if (skb_is_gso_v6(skb)) { hdrlen = skb_headlen(skb) - ETH_HLEN; - else { + } else { struct iphdr *iph = ip_hdr(skb); tcp_opt_len = tcp_optlen(skb); @@ -5798,7 +5798,7 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb, iph = ip_hdr(skb); tcp_opt_len = tcp_optlen(skb); - if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6) { + if (skb_is_gso_v6(skb)) { hdr_len = skb_headlen(skb) - ETH_HLEN; } else { u32 ip_tcp_len;