diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-10-18 17:00:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-10-19 03:10:46 -0400 |
commit | 9e903e085262ffbf1fc44a17ac06058aca03524a (patch) | |
tree | 4acefc97ba38c1733474d25c0b2053b56af97db1 /drivers/net/ethernet/realtek | |
parent | dd767856a36e00b631d65ebc4bb81b19915532d6 (diff) |
net: add skb frag size accessors
To ease skb->truesize sanitization, its better to be able to localize
all references to skb frags size.
Define accessors : skb_frag_size() to fetch frag size, and
skb_frag_size_{set|add|sub}() to manipulate it.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/realtek')
-rw-r--r-- | drivers/net/ethernet/realtek/8139cp.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c index 5dcd5be03f3..ee5da9293ce 100644 --- a/drivers/net/ethernet/realtek/8139cp.c +++ b/drivers/net/ethernet/realtek/8139cp.c | |||
@@ -777,12 +777,12 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb, | |||
777 | entry = NEXT_TX(entry); | 777 | entry = NEXT_TX(entry); |
778 | 778 | ||
779 | for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) { | 779 | for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) { |
780 | skb_frag_t *this_frag = &skb_shinfo(skb)->frags[frag]; | 780 | const skb_frag_t *this_frag = &skb_shinfo(skb)->frags[frag]; |
781 | u32 len; | 781 | u32 len; |
782 | u32 ctrl; | 782 | u32 ctrl; |
783 | dma_addr_t mapping; | 783 | dma_addr_t mapping; |
784 | 784 | ||
785 | len = this_frag->size; | 785 | len = skb_frag_size(this_frag); |
786 | mapping = dma_map_single(&cp->pdev->dev, | 786 | mapping = dma_map_single(&cp->pdev->dev, |
787 | skb_frag_address(this_frag), | 787 | skb_frag_address(this_frag), |
788 | len, PCI_DMA_TODEVICE); | 788 | len, PCI_DMA_TODEVICE); |
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 2ce60709a45..aa39e771175 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c | |||
@@ -5413,7 +5413,7 @@ static int rtl8169_xmit_frags(struct rtl8169_private *tp, struct sk_buff *skb, | |||
5413 | 5413 | ||
5414 | entry = tp->cur_tx; | 5414 | entry = tp->cur_tx; |
5415 | for (cur_frag = 0; cur_frag < info->nr_frags; cur_frag++) { | 5415 | for (cur_frag = 0; cur_frag < info->nr_frags; cur_frag++) { |
5416 | skb_frag_t *frag = info->frags + cur_frag; | 5416 | const skb_frag_t *frag = info->frags + cur_frag; |
5417 | dma_addr_t mapping; | 5417 | dma_addr_t mapping; |
5418 | u32 status, len; | 5418 | u32 status, len; |
5419 | void *addr; | 5419 | void *addr; |
@@ -5421,7 +5421,7 @@ static int rtl8169_xmit_frags(struct rtl8169_private *tp, struct sk_buff *skb, | |||
5421 | entry = (entry + 1) % NUM_TX_DESC; | 5421 | entry = (entry + 1) % NUM_TX_DESC; |
5422 | 5422 | ||
5423 | txd = tp->TxDescArray + entry; | 5423 | txd = tp->TxDescArray + entry; |
5424 | len = frag->size; | 5424 | len = skb_frag_size(frag); |
5425 | addr = skb_frag_address(frag); | 5425 | addr = skb_frag_address(frag); |
5426 | mapping = dma_map_single(d, addr, len, DMA_TO_DEVICE); | 5426 | mapping = dma_map_single(d, addr, len, DMA_TO_DEVICE); |
5427 | if (unlikely(dma_mapping_error(d, mapping))) { | 5427 | if (unlikely(dma_mapping_error(d, mapping))) { |