aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tg3.c
diff options
context:
space:
mode:
authorMatt Carlson <mcarlson@broadcom.com>2010-09-15 04:59:59 -0400
committerDavid S. Miller <davem@davemloft.net>2010-09-15 17:16:14 -0400
commit02e96080af2b70313f2ffc8c1b03ae2f9d8c65ac (patch)
tree50672b37412a153916a9d13e0f5965b7aa839d25 /drivers/net/tg3.c
parent8fea32b9555726d35b91492d17fc21c7874d36f9 (diff)
tg3: Use skb_is_gso_v6()
This patch converts the driver to prefer the skb_is_gso_v6() helper over the explicit inlined version. Reviewed-by: Benjamin Li <benli@broadcom.com> Reviewed-by: Michael Chan <mchan@broadcom.com> Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r--drivers/net/tg3.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 179eb6539bd0..a4fbe4f85ffe 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -5574,9 +5574,9 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb,
5574 goto out_unlock; 5574 goto out_unlock;
5575 } 5575 }
5576 5576
5577 if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6) 5577 if (skb_is_gso_v6(skb)) {
5578 hdrlen = skb_headlen(skb) - ETH_HLEN; 5578 hdrlen = skb_headlen(skb) - ETH_HLEN;
5579 else { 5579 } else {
5580 struct iphdr *iph = ip_hdr(skb); 5580 struct iphdr *iph = ip_hdr(skb);
5581 5581
5582 tcp_opt_len = tcp_optlen(skb); 5582 tcp_opt_len = tcp_optlen(skb);
@@ -5798,7 +5798,7 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb,
5798 iph = ip_hdr(skb); 5798 iph = ip_hdr(skb);
5799 tcp_opt_len = tcp_optlen(skb); 5799 tcp_opt_len = tcp_optlen(skb);
5800 5800
5801 if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6) { 5801 if (skb_is_gso_v6(skb)) {
5802 hdr_len = skb_headlen(skb) - ETH_HLEN; 5802 hdr_len = skb_headlen(skb) - ETH_HLEN;
5803 } else { 5803 } else {
5804 u32 ip_tcp_len; 5804 u32 ip_tcp_len;