Commit e743d313 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

drivers: net: use skb_headlen() 



replaces (skb->len - skb->data_len) occurrences by skb_headlen(skb)

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b4bf665c

drivers/atm/eni.c

+1 −1
Original line number Diff line number Diff line
@@ -1131,7 +1131,7 @@ DPRINTK("doing direct send\n"); /* @@@ well, this doesn't work anyway */ 
			if (i == -1)

				put_dma(tx->index,eni_dev->dma,&j,(unsigned long)

				    skb->data,

				    skb->len - skb->data_len);

				    skb_headlen(skb));

			else

				put_dma(tx->index,eni_dev->dma,&j,(unsigned long)

				    skb_shinfo(skb)->frags[i].page + skb_shinfo(skb)->frags[i].page_offset,

drivers/atm/he.c

+2 −2
Original line number Diff line number Diff line
@@ -2664,8 +2664,8 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb) 


#ifdef USE_SCATTERGATHER

	tpd->iovec[slot].addr = pci_map_single(he_dev->pci_dev, skb->data,

				skb->len - skb->data_len, PCI_DMA_TODEVICE);

	tpd->iovec[slot].len = skb->len - skb->data_len;

				skb_headlen(skb), PCI_DMA_TODEVICE);

	tpd->iovec[slot].len = skb_headlen(skb);

	++slot;



	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {

drivers/net/3c59x.c

+2 −2
Original line number Diff line number Diff line
@@ -2129,8 +2129,8 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev) 
		int i;



		vp->tx_ring[entry].frag[0].addr = cpu_to_le32(pci_map_single(VORTEX_PCI(vp), skb->data,

										skb->len-skb->data_len, PCI_DMA_TODEVICE));

		vp->tx_ring[entry].frag[0].length = cpu_to_le32(skb->len-skb->data_len);

										skb_headlen(skb), PCI_DMA_TODEVICE));

		vp->tx_ring[entry].frag[0].length = cpu_to_le32(skb_headlen(skb));



		for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {

			skb_frag_t *frag = &skb_shinfo(skb)->frags[i];

drivers/net/atl1e/atl1e_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1679,7 +1679,7 @@ static void atl1e_tx_map(struct atl1e_adapter *adapter, 
{

	struct atl1e_tpd_desc *use_tpd = NULL;

	struct atl1e_tx_buffer *tx_buffer = NULL;

	u16 buf_len = skb->len - skb->data_len;

	u16 buf_len = skb_headlen(skb);

	u16 map_len = 0;

	u16 mapped_len = 0;

	u16 hdr_len = 0;

drivers/net/atlx/atl1.c

+2 −2
Original line number Diff line number Diff line
@@ -2347,7 +2347,7 @@ static netdev_tx_t atl1_xmit_frame(struct sk_buff *skb, 
{

	struct atl1_adapter *adapter = netdev_priv(netdev);

	struct atl1_tpd_ring *tpd_ring = &adapter->tpd_ring;

	int len = skb->len;

	int len;

	int tso;

	int count = 1;

	int ret_val;
@@ -2359,7 +2359,7 @@ static netdev_tx_t atl1_xmit_frame(struct sk_buff *skb, 
	unsigned int f;

	unsigned int proto_hdr_len;



	len -= skb->data_len;

	len = skb_headlen(skb);



	if (unlikely(skb->len <= 0)) {

		dev_kfree_skb_any(skb);