diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-04-15 00:59:40 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-15 01:11:33 +0200 |
| commit | e743d31312d00932391b123dfac3324d2b9e8c81 (patch) | |
| tree | e5ac3aacbfdde1fe8eb44c4e010085915da5ea05 /drivers/net/s2io.c | |
| parent | virtio_net: Fix mis-merge. (diff) | |
| download | linux-e743d31312d00932391b123dfac3324d2b9e8c81.tar.xz linux-e743d31312d00932391b123dfac3324d2b9e8c81.zip | |
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, return NULL; } pci_unmap_single(nic->pdev, (dma_addr_t)txds->Buffer_Pointer, - skb->len - skb->data_len, PCI_DMA_TODEVICE); + skb_headlen(skb), PCI_DMA_TODEVICE); frg_cnt = skb_shinfo(skb)->nr_frags; if (frg_cnt) { txds++; @@ -4202,7 +4202,7 @@ static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev) txdp->Control_2 |= TXD_VLAN_TAG(vlan_tag); } - frg_len = skb->len - skb->data_len; + frg_len = skb_headlen(skb); if (offload_type == SKB_GSO_UDP) { int ufo_size; |