diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-04-14 18:59:40 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-14 19:11:33 -0400 |
commit | e743d31312d00932391b123dfac3324d2b9e8c81 (patch) | |
tree | e5ac3aacbfdde1fe8eb44c4e010085915da5ea05 /drivers/net/s2io.c | |
parent | b4bf665c5761837f693e87ab27870a5868185ccc (diff) |
drivers: net: use skb_headlen()
replaces (skb->len - skb->data_len) occurrences by skb_headlen(skb)
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/s2io.c')
-rw-r--r-- | drivers/net/s2io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index bab0061f30f1..f155928bf14e 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
@@ -2400,7 +2400,7 @@ static struct sk_buff *s2io_txdl_getskb(struct fifo_info *fifo_data, | |||
2400 | return NULL; | 2400 | return NULL; |
2401 | } | 2401 | } |
2402 | pci_unmap_single(nic->pdev, (dma_addr_t)txds->Buffer_Pointer, | 2402 | pci_unmap_single(nic->pdev, (dma_addr_t)txds->Buffer_Pointer, |
2403 | skb->len - skb->data_len, PCI_DMA_TODEVICE); | 2403 | skb_headlen(skb), PCI_DMA_TODEVICE); |
2404 | frg_cnt = skb_shinfo(skb)->nr_frags; | 2404 | frg_cnt = skb_shinfo(skb)->nr_frags; |
2405 | if (frg_cnt) { | 2405 | if (frg_cnt) { |
2406 | txds++; | 2406 | txds++; |
@@ -4202,7 +4202,7 @@ static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev) | |||
4202 | txdp->Control_2 |= TXD_VLAN_TAG(vlan_tag); | 4202 | txdp->Control_2 |= TXD_VLAN_TAG(vlan_tag); |
4203 | } | 4203 | } |
4204 | 4204 | ||
4205 | frg_len = skb->len - skb->data_len; | 4205 | frg_len = skb_headlen(skb); |
4206 | if (offload_type == SKB_GSO_UDP) { | 4206 | if (offload_type == SKB_GSO_UDP) { |
4207 | int ufo_size; | 4207 | int ufo_size; |
4208 | 4208 | ||