aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/igb
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-01-28 09:12:38 -0500
committerDavid S. Miller <davem@davemloft.net>2010-01-28 09:12:38 -0500
commit05ba712d7eb156009753e18e5116cabd869cc6e2 (patch)
tree1ad850d6889f6b3671a5636653940f20a7d22bdf /drivers/net/igb
parent257ddbdad13cd3c4f7d03b85af632c508aa8abc9 (diff)
parentb473946a0853860e13b51c28add5524741117786 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/igb')
-rw-r--r--drivers/net/igb/igb_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 01cc29483e2f..0a064ce3eb45 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -3423,7 +3423,7 @@ static inline int igb_tso_adv(struct igb_ring *tx_ring,
3423 iph->daddr, 0, 3423 iph->daddr, 0,
3424 IPPROTO_TCP, 3424 IPPROTO_TCP,
3425 0); 3425 0);
3426 } else if (skb_shinfo(skb)->gso_type == SKB_GSO_TCPV6) { 3426 } else if (skb_is_gso_v6(skb)) {
3427 ipv6_hdr(skb)->payload_len = 0; 3427 ipv6_hdr(skb)->payload_len = 0;
3428 tcp_hdr(skb)->check = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr, 3428 tcp_hdr(skb)->check = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
3429 &ipv6_hdr(skb)->daddr, 3429 &ipv6_hdr(skb)->daddr,
@@ -3585,6 +3585,7 @@ static inline int igb_tx_map_adv(struct igb_ring *tx_ring, struct sk_buff *skb,
3585 for (f = 0; f < skb_shinfo(skb)->nr_frags; f++) { 3585 for (f = 0; f < skb_shinfo(skb)->nr_frags; f++) {
3586 struct skb_frag_struct *frag; 3586 struct skb_frag_struct *frag;
3587 3587
3588 count++;
3588 i++; 3589 i++;
3589 if (i == tx_ring->count) 3590 if (i == tx_ring->count)
3590 i = 0; 3591 i = 0;
@@ -3606,7 +3607,6 @@ static inline int igb_tx_map_adv(struct igb_ring *tx_ring, struct sk_buff *skb,
3606 if (pci_dma_mapping_error(pdev, buffer_info->dma)) 3607 if (pci_dma_mapping_error(pdev, buffer_info->dma))
3607 goto dma_error; 3608 goto dma_error;
3608 3609
3609 count++;
3610 } 3610 }
3611 3611
3612 tx_ring->buffer_info[i].skb = skb; 3612 tx_ring->buffer_info[i].skb = skb;