From ced9e0874c903203084061a13d77a5cabd9b1957 Mon Sep 17 00:00:00 2001 From: James Morris Date: Sun, 6 Apr 2003 10:04:44 -0700 Subject: [PATCH] [NET]: skb_headlen() cleanup. --- drivers/net/8139cp.c | 2 +- drivers/net/acenic.c | 2 +- drivers/net/e100/e100_main.c | 4 ++-- drivers/net/sungem.c | 2 +- drivers/net/sunhme.c | 2 +- drivers/net/tg3.c | 12 ++++++------ drivers/net/typhoon.c | 2 +- net/core/datagram.c | 4 ++-- net/core/skbuff.c | 10 +++++----- net/ipv4/tcp_output.c | 2 +- net/xfrm/xfrm_algo.c | 4 ++-- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index 838eea92f8f2d..5bc9fe749d833 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c @@ -826,7 +826,7 @@ static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev) * Otherwise we could race with the device. */ first_eor = eor; - first_len = skb->len - skb->data_len; + first_len = skb_headlen(skb); first_mapping = pci_map_single(cp->pdev, skb->data, first_len, PCI_DMA_TODEVICE); cp->tx_skb[entry].skb = skb; diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c index e05a28c98a944..502e1f0414bab 100644 --- a/drivers/net/acenic.c +++ b/drivers/net/acenic.c @@ -2829,7 +2829,7 @@ restart: int i, len = 0; mapping = ace_map_tx_skb(ap, skb, NULL, idx); - flagsize = ((skb->len - skb->data_len) << 16); + flagsize = (skb_headlen(skb) << 16); if (skb->ip_summed == CHECKSUM_HW) flagsize |= BD_FLG_TCP_UDP_SUM; #if ACENIC_DO_VLAN diff --git a/drivers/net/e100/e100_main.c b/drivers/net/e100/e100_main.c index d241eaa64e2e8..2f3f6f6b1e8da 100644 --- a/drivers/net/e100/e100_main.c +++ b/drivers/net/e100/e100_main.c @@ -2199,10 +2199,10 @@ e100_prepare_xmit_buff(struct e100_private *bdp, struct sk_buff *skb) (tcb->tbd_ptr)->tbd_buf_addr = cpu_to_le32(pci_map_single(bdp->pdev, skb->data, - (skb->len - skb->data_len), + skb_headlen(skb), PCI_DMA_TODEVICE)); (tcb->tbd_ptr)->tbd_buf_cnt = - cpu_to_le16(skb->len - skb->data_len); + cpu_to_le16(skb_headlen(skb)); for (i = 0; i < skb_shinfo(skb)->nr_frags; i++, tbd_arr_ptr++, frag++) { diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 7c139fdafea6c..daeb1f39e9c81 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c @@ -894,7 +894,7 @@ static int gem_start_xmit(struct sk_buff *skb, struct net_device *dev) /* We must give this initial chunk to the device last. * Otherwise we could race with the device. */ - first_len = skb->len - skb->data_len; + first_len = skb_headlen(skb); first_mapping = pci_map_page(gp->pdev, virt_to_page(skb->data), ((unsigned long) skb->data & ~PAGE_MASK), first_len, PCI_DMA_TODEVICE); diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index 5b34d6ecb03bd..631d07021d815 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c @@ -2319,7 +2319,7 @@ static int happy_meal_start_xmit(struct sk_buff *skb, struct net_device *dev) /* We must give this initial chunk to the device last. * Otherwise we could race with the device. */ - first_len = skb->len - skb->data_len; + first_len = skb_headlen(skb); first_mapping = hme_dma_map(hp, skb->data, first_len, DMA_TODEVICE); entry = NEXT_TX(entry); diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index ea4082646fdee..07a311b66d3c5 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -1751,7 +1751,7 @@ static void tg3_tx(struct tg3 *tp) pci_unmap_single(tp->pdev, pci_unmap_addr(ri, mapping), - (skb->len - skb->data_len), + skb_headlen(skb), PCI_DMA_TODEVICE); ri->skb = NULL; @@ -2316,7 +2316,7 @@ static int tigon3_4gb_hwbug_workaround(struct tg3 *tp, struct sk_buff *skb, int len; if (i == 0) - len = skb->len - skb->data_len; + len = skb_headlen(skb); else len = skb_shinfo(skb)->frags[i-1].size; pci_unmap_single(tp->pdev, @@ -2401,7 +2401,7 @@ static int tg3_start_xmit_4gbug(struct sk_buff *skb, struct net_device *dev) int would_hit_hwbug; unsigned long flags; - len = (skb->len - skb->data_len); + len = skb_headlen(skb); /* No BH disabling for tx_lock here. We are running in BH disabled * context and TX reclaim runs via tp->poll inside of a software @@ -2520,7 +2520,7 @@ static int tg3_start_xmit_4gbug(struct sk_buff *skb, struct net_device *dev) i = 0; while (entry != last_plus_one) { if (i == 0) - len = skb->len - skb->data_len; + len = skb_headlen(skb); else len = skb_shinfo(skb)->frags[i-1].size; @@ -2593,7 +2593,7 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) u32 len, entry, base_flags, mss; unsigned long flags; - len = (skb->len - skb->data_len); + len = skb_headlen(skb); /* No BH disabling for tx_lock here. We are running in BH disabled * context and TX reclaim runs via tp->poll inside of a software @@ -2829,7 +2829,7 @@ static void tg3_free_rings(struct tg3 *tp) pci_unmap_single(tp->pdev, pci_unmap_addr(txp, mapping), - (skb->len - skb->data_len), + skb_headlen(skb), PCI_DMA_TODEVICE); txp->skb = NULL; diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index e6c46f2f41a0d..6a6a8eb72c10e 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c @@ -844,7 +844,7 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev) } else { int i, len; - len = skb->len - skb->data_len; + len = skb_headlen(skb); skb_dma = pci_map_single(tp->tx_pdev, skb->data, len, PCI_DMA_TODEVICE); txd->flags = TYPHOON_FRAG_DESC | TYPHOON_DESC_VALID; diff --git a/net/core/datagram.c b/net/core/datagram.c index f83189e52b130..7474e087fa122 100644 --- a/net/core/datagram.c +++ b/net/core/datagram.c @@ -220,7 +220,7 @@ int skb_copy_datagram(const struct sk_buff *skb, int offset, char *to, int size) int skb_copy_datagram_iovec(const struct sk_buff *skb, int offset, struct iovec *to, int len) { - int start = skb->len - skb->data_len; + int start = skb_headlen(skb); int i, copy = start - offset; /* Copy header. */ @@ -295,7 +295,7 @@ fault: int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset, u8 *to, int len, unsigned int *csump) { - int start = skb->len - skb->data_len; + int start = skb_headlen(skb); int pos = 0; int i, copy = start - offset; diff --git a/net/core/skbuff.c b/net/core/skbuff.c index c909a7d3f00a3..bb68b12b00471 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -932,7 +932,7 @@ pull_pages: int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len) { int i, copy; - int start = skb->len - skb->data_len; + int start = skb_headlen(skb); if (offset > (int)skb->len - len) goto fault; @@ -1009,7 +1009,7 @@ fault: unsigned int skb_checksum(const struct sk_buff *skb, int offset, int len, unsigned int csum) { - int start = skb->len - skb->data_len; + int start = skb_headlen(skb); int i, copy = start - offset; int pos = 0; @@ -1085,7 +1085,7 @@ unsigned int skb_checksum(const struct sk_buff *skb, int offset, unsigned int skb_copy_and_csum_bits(const struct sk_buff *skb, int offset, u8 *to, int len, unsigned int csum) { - int start = skb->len - skb->data_len; + int start = skb_headlen(skb); int i, copy = start - offset; int pos = 0; @@ -1170,9 +1170,9 @@ void skb_copy_and_csum_dev(const struct sk_buff *skb, u8 *to) if (skb->ip_summed == CHECKSUM_HW) csstart = skb->h.raw - skb->data; else - csstart = skb->len - skb->data_len; + csstart = skb_headlen(skb); - if (csstart > skb->len - skb->data_len) + if (csstart > skb_headlen(skb)) BUG(); memcpy(to, skb->data, csstart); diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index fd3baeb58b8fd..344353ac7a6fb 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -354,7 +354,7 @@ void tcp_push_one(struct sock *sk, unsigned cur_mss) static void skb_split(struct sk_buff *skb, struct sk_buff *skb1, u32 len) { int i; - int pos = skb->len - skb->data_len; + int pos = skb_headlen(skb); if (len < pos) { /* Split line is inside header. */ diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c index d01a6fd024561..b850f0285cf2e 100644 --- a/net/xfrm/xfrm_algo.c +++ b/net/xfrm/xfrm_algo.c @@ -445,7 +445,7 @@ int xfrm_count_enc_supported(void) void skb_icv_walk(const struct sk_buff *skb, struct crypto_tfm *tfm, int offset, int len, icv_update_fn_t icv_update) { - int start = skb->len - skb->data_len; + int start = skb_headlen(skb); int i, copy = start - offset; struct scatterlist sg; @@ -521,7 +521,7 @@ void skb_icv_walk(const struct sk_buff *skb, struct crypto_tfm *tfm, int skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset, int len) { - int start = skb->len - skb->data_len; + int start = skb_headlen(skb); int i, copy = start - offset; int elt = 0; -- 2.53.0