Skip to content

Commit e743d31

Browse files
Eric Dumazetdavem330
Eric Dumazet
authored and
davem330
committed
drivers: net: use skb_headlen()
replaces (skb->len - skb->data_len) occurrences by skb_headlen(skb) Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent b4bf665 commit e743d31

File tree

17 files changed

+33
-33
lines changed

17 files changed

+33
-33
lines changed

‎drivers/atm/eni.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1131,7 +1131,7 @@ DPRINTK("doing direct send\n"); /* @@@ well, this doesn't work anyway */
11311131
if (i == -1)
11321132
put_dma(tx->index,eni_dev->dma,&j,(unsigned long)
11331133
skb->data,
1134-
skb->len - skb->data_len);
1134+
skb_headlen(skb));
11351135
else
11361136
put_dma(tx->index,eni_dev->dma,&j,(unsigned long)
11371137
skb_shinfo(skb)->frags[i].page + skb_shinfo(skb)->frags[i].page_offset,

‎drivers/atm/he.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2664,8 +2664,8 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
26642664

26652665
#ifdef USE_SCATTERGATHER
26662666
tpd->iovec[slot].addr = pci_map_single(he_dev->pci_dev, skb->data,
2667-
skb->len - skb->data_len, PCI_DMA_TODEVICE);
2668-
tpd->iovec[slot].len = skb->len - skb->data_len;
2667+
skb_headlen(skb), PCI_DMA_TODEVICE);
2668+
tpd->iovec[slot].len = skb_headlen(skb);
26692669
++slot;
26702670

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

‎drivers/net/3c59x.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2129,8 +2129,8 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev)
21292129
int i;
21302130

21312131
vp->tx_ring[entry].frag[0].addr = cpu_to_le32(pci_map_single(VORTEX_PCI(vp), skb->data,
2132-
skb->len-skb->data_len, PCI_DMA_TODEVICE));
2133-
vp->tx_ring[entry].frag[0].length = cpu_to_le32(skb->len-skb->data_len);
2132+
skb_headlen(skb), PCI_DMA_TODEVICE));
2133+
vp->tx_ring[entry].frag[0].length = cpu_to_le32(skb_headlen(skb));
21342134

21352135
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
21362136
skb_frag_t *frag = &skb_shinfo(skb)->frags[i];

‎drivers/net/atl1e/atl1e_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1679,7 +1679,7 @@ static void atl1e_tx_map(struct atl1e_adapter *adapter,
16791679
{
16801680
struct atl1e_tpd_desc *use_tpd = NULL;
16811681
struct atl1e_tx_buffer *tx_buffer = NULL;
1682-
u16 buf_len = skb->len - skb->data_len;
1682+
u16 buf_len = skb_headlen(skb);
16831683
u16 map_len = 0;
16841684
u16 mapped_len = 0;
16851685
u16 hdr_len = 0;

‎drivers/net/atlx/atl1.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2347,7 +2347,7 @@ static netdev_tx_t atl1_xmit_frame(struct sk_buff *skb,
23472347
{
23482348
struct atl1_adapter *adapter = netdev_priv(netdev);
23492349
struct atl1_tpd_ring *tpd_ring = &adapter->tpd_ring;
2350-
int len = skb->len;
2350+
int len;
23512351
int tso;
23522352
int count = 1;
23532353
int ret_val;
@@ -2359,7 +2359,7 @@ static netdev_tx_t atl1_xmit_frame(struct sk_buff *skb,
23592359
unsigned int f;
23602360
unsigned int proto_hdr_len;
23612361

2362-
len -= skb->data_len;
2362+
len = skb_headlen(skb);
23632363

23642364
if (unlikely(skb->len <= 0)) {
23652365
dev_kfree_skb_any(skb);

‎drivers/net/benet/be_main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ static int make_tx_wrbs(struct be_adapter *adapter,
432432
map_head = txq->head;
433433

434434
if (skb->len > skb->data_len) {
435-
int len = skb->len - skb->data_len;
435+
int len = skb_headlen(skb);
436436
busaddr = pci_map_single(pdev, skb->data, len,
437437
PCI_DMA_TODEVICE);
438438
if (pci_dma_mapping_error(pdev, busaddr))
@@ -1098,7 +1098,7 @@ static void be_tx_compl_process(struct be_adapter *adapter, u16 last_index)
10981098
cur_index = txq->tail;
10991099
wrb = queue_tail_node(txq);
11001100
unmap_tx_frag(adapter->pdev, wrb, (unmap_skb_hdr &&
1101-
sent_skb->len > sent_skb->data_len));
1101+
skb_headlen(sent_skb)));
11021102
unmap_skb_hdr = false;
11031103

11041104
num_wrbs++;

‎drivers/net/chelsio/sge.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,7 +1123,7 @@ static inline unsigned int compute_large_page_tx_descs(struct sk_buff *skb)
11231123

11241124
if (PAGE_SIZE > SGE_TX_DESC_MAX_PLEN) {
11251125
unsigned int nfrags = skb_shinfo(skb)->nr_frags;
1126-
unsigned int i, len = skb->len - skb->data_len;
1126+
unsigned int i, len = skb_headlen(skb);
11271127
while (len > SGE_TX_DESC_MAX_PLEN) {
11281128
count++;
11291129
len -= SGE_TX_DESC_MAX_PLEN;
@@ -1219,10 +1219,10 @@ static inline void write_tx_descs(struct adapter *adapter, struct sk_buff *skb,
12191219
ce = &q->centries[pidx];
12201220

12211221
mapping = pci_map_single(adapter->pdev, skb->data,
1222-
skb->len - skb->data_len, PCI_DMA_TODEVICE);
1222+
skb_headlen(skb), PCI_DMA_TODEVICE);
12231223

12241224
desc_mapping = mapping;
1225-
desc_len = skb->len - skb->data_len;
1225+
desc_len = skb_headlen(skb);
12261226

12271227
flags = F_CMD_DATAVALID | F_CMD_SOP |
12281228
V_CMD_EOP(nfrags == 0 && desc_len <= SGE_TX_DESC_MAX_PLEN) |
@@ -1258,7 +1258,7 @@ static inline void write_tx_descs(struct adapter *adapter, struct sk_buff *skb,
12581258

12591259
ce->skb = NULL;
12601260
dma_unmap_addr_set(ce, dma_addr, mapping);
1261-
dma_unmap_len_set(ce, dma_len, skb->len - skb->data_len);
1261+
dma_unmap_len_set(ce, dma_len, skb_headlen(skb));
12621262

12631263
for (i = 0; nfrags--; i++) {
12641264
skb_frag_t *frag = &skb_shinfo(skb)->frags[i];

‎drivers/net/e1000/e1000_main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2929,7 +2929,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
29292929
unsigned int first, max_per_txd = E1000_MAX_DATA_PER_TXD;
29302930
unsigned int max_txd_pwr = E1000_MAX_TXD_PWR;
29312931
unsigned int tx_flags = 0;
2932-
unsigned int len = skb->len - skb->data_len;
2932+
unsigned int len = skb_headlen(skb);
29332933
unsigned int nr_frags;
29342934
unsigned int mss;
29352935
int count = 0;
@@ -2980,7 +2980,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
29802980
dev_kfree_skb_any(skb);
29812981
return NETDEV_TX_OK;
29822982
}
2983-
len = skb->len - skb->data_len;
2983+
len = skb_headlen(skb);
29842984
break;
29852985
default:
29862986
/* do nothing */

‎drivers/net/e1000e/netdev.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4132,7 +4132,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
41324132
unsigned int max_per_txd = E1000_MAX_PER_TXD;
41334133
unsigned int max_txd_pwr = E1000_MAX_TXD_PWR;
41344134
unsigned int tx_flags = 0;
4135-
unsigned int len = skb->len - skb->data_len;
4135+
unsigned int len = skb_headlen(skb);
41364136
unsigned int nr_frags;
41374137
unsigned int mss;
41384138
int count = 0;
@@ -4182,7 +4182,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
41824182
dev_kfree_skb_any(skb);
41834183
return NETDEV_TX_OK;
41844184
}
4185-
len = skb->len - skb->data_len;
4185+
len = skb_headlen(skb);
41864186
}
41874187
}
41884188

‎drivers/net/ehea/ehea_main.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1618,7 +1618,7 @@ static void write_swqe2_TSO(struct sk_buff *skb,
16181618
{
16191619
struct ehea_vsgentry *sg1entry = &swqe->u.immdata_desc.sg_entry;
16201620
u8 *imm_data = &swqe->u.immdata_desc.immediate_data[0];
1621-
int skb_data_size = skb->len - skb->data_len;
1621+
int skb_data_size = skb_headlen(skb);
16221622
int headersize;
16231623

16241624
/* Packet is TCP with TSO enabled */
@@ -1629,7 +1629,7 @@ static void write_swqe2_TSO(struct sk_buff *skb,
16291629
*/
16301630
headersize = ETH_HLEN + ip_hdrlen(skb) + tcp_hdrlen(skb);
16311631

1632-
skb_data_size = skb->len - skb->data_len;
1632+
skb_data_size = skb_headlen(skb);
16331633

16341634
if (skb_data_size >= headersize) {
16351635
/* copy immediate data */
@@ -1651,7 +1651,7 @@ static void write_swqe2_TSO(struct sk_buff *skb,
16511651
static void write_swqe2_nonTSO(struct sk_buff *skb,
16521652
struct ehea_swqe *swqe, u32 lkey)
16531653
{
1654-
int skb_data_size = skb->len - skb->data_len;
1654+
int skb_data_size = skb_headlen(skb);
16551655
u8 *imm_data = &swqe->u.immdata_desc.immediate_data[0];
16561656
struct ehea_vsgentry *sg1entry = &swqe->u.immdata_desc.sg_entry;
16571657

@@ -2108,8 +2108,8 @@ static void ehea_xmit3(struct sk_buff *skb, struct net_device *dev,
21082108
} else {
21092109
/* first copy data from the skb->data buffer ... */
21102110
skb_copy_from_linear_data(skb, imm_data,
2111-
skb->len - skb->data_len);
2112-
imm_data += skb->len - skb->data_len;
2111+
skb_headlen(skb));
2112+
imm_data += skb_headlen(skb);
21132113

21142114
/* ... then copy data from the fragments */
21152115
for (i = 0; i < nfrags; i++) {

‎drivers/net/forcedeth.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2148,7 +2148,7 @@ static netdev_tx_t nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
21482148
unsigned int i;
21492149
u32 offset = 0;
21502150
u32 bcnt;
2151-
u32 size = skb->len-skb->data_len;
2151+
u32 size = skb_headlen(skb);
21522152
u32 entries = (size >> NV_TX2_TSO_MAX_SHIFT) + ((size & (NV_TX2_TSO_MAX_SIZE-1)) ? 1 : 0);
21532153
u32 empty_slots;
21542154
struct ring_desc* put_tx;
@@ -2269,7 +2269,7 @@ static netdev_tx_t nv_start_xmit_optimized(struct sk_buff *skb,
22692269
unsigned int i;
22702270
u32 offset = 0;
22712271
u32 bcnt;
2272-
u32 size = skb->len-skb->data_len;
2272+
u32 size = skb_headlen(skb);
22732273
u32 entries = (size >> NV_TX2_TSO_MAX_SHIFT) + ((size & (NV_TX2_TSO_MAX_SIZE-1)) ? 1 : 0);
22742274
u32 empty_slots;
22752275
struct ring_desc_ex* put_tx;

‎drivers/net/ixgbevf/ixgbevf_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ static bool ixgbevf_clean_rx_irq(struct ixgbevf_q_vector *q_vector,
604604
* packets not getting split correctly
605605
*/
606606
if (staterr & IXGBE_RXD_STAT_LB) {
607-
u32 header_fixup_len = skb->len - skb->data_len;
607+
u32 header_fixup_len = skb_headlen(skb);
608608
if (header_fixup_len < 14)
609609
skb_push(skb, header_fixup_len);
610610
}

‎drivers/net/ksz884x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4684,7 +4684,7 @@ static void send_packet(struct sk_buff *skb, struct net_device *dev)
46844684
int frag;
46854685
skb_frag_t *this_frag;
46864686

4687-
dma_buf->len = skb->len - skb->data_len;
4687+
dma_buf->len = skb_headlen(skb);
46884688

46894689
dma_buf->dma = pci_map_single(
46904690
hw_priv->pdev, skb->data, dma_buf->len,

‎drivers/net/myri10ge/myri10ge.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2757,7 +2757,7 @@ static netdev_tx_t myri10ge_xmit(struct sk_buff *skb,
27572757
}
27582758

27592759
/* map the skb for DMA */
2760-
len = skb->len - skb->data_len;
2760+
len = skb_headlen(skb);
27612761
idx = tx->req & tx->mask;
27622762
tx->info[idx].skb = skb;
27632763
bus = pci_map_single(mgp->pdev, skb->data, len, PCI_DMA_TODEVICE);

‎drivers/net/s2io.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2400,7 +2400,7 @@ static struct sk_buff *s2io_txdl_getskb(struct fifo_info *fifo_data,
24002400
return NULL;
24012401
}
24022402
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);
24042404
frg_cnt = skb_shinfo(skb)->nr_frags;
24052405
if (frg_cnt) {
24062406
txds++;
@@ -4202,7 +4202,7 @@ static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev)
42024202
txdp->Control_2 |= TXD_VLAN_TAG(vlan_tag);
42034203
}
42044204

4205-
frg_len = skb->len - skb->data_len;
4205+
frg_len = skb_headlen(skb);
42064206
if (offload_type == SKB_GSO_UDP) {
42074207
int ufo_size;
42084208

‎drivers/net/tehuti.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1508,7 +1508,7 @@ bdx_tx_map_skb(struct bdx_priv *priv, struct sk_buff *skb,
15081508
int nr_frags = skb_shinfo(skb)->nr_frags;
15091509
int i;
15101510

1511-
db->wptr->len = skb->len - skb->data_len;
1511+
db->wptr->len = skb_headlen(skb);
15121512
db->wptr->addr.dma = pci_map_single(priv->pdev, skb->data,
15131513
db->wptr->len, PCI_DMA_TODEVICE);
15141514
pbl->len = CPU_CHIP_SWAP32(db->wptr->len);

‎drivers/net/tsi108_eth.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -704,8 +704,8 @@ static int tsi108_send_packet(struct sk_buff * skb, struct net_device *dev)
704704

705705
if (i == 0) {
706706
data->txring[tx].buf0 = dma_map_single(NULL, skb->data,
707-
skb->len - skb->data_len, DMA_TO_DEVICE);
708-
data->txring[tx].len = skb->len - skb->data_len;
707+
skb_headlen(skb), DMA_TO_DEVICE);
708+
data->txring[tx].len = skb_headlen(skb);
709709
misc |= TSI108_TX_SOF;
710710
} else {
711711
skb_frag_t *frag = &skb_shinfo(skb)->frags[i - 1];

0 commit comments

Comments
 (0)