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>

2 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
index 9ca45dcba755..b42c06baba89 100644
--- a/drivers/net/ethernet/3com/3c59x.c
+++ b/drivers/net/ethernet/3com/3c59x.c
@@ -2182,12 +2182,12 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                         cpu_to_le32(pci_map_single(
                                                 VORTEX_PCI(vp),
                                                 (void *)skb_frag_address(frag),
-                                                frag->size, PCI_DMA_TODEVICE));
+                                                skb_frag_size(frag), PCI_DMA_TODEVICE));
 
                         if (i == skb_shinfo(skb)->nr_frags-1)
-                                        vp->tx_ring[entry].frag[i+1].length = cpu_to_le32(frag->size|LAST_FRAG);
+                                        vp->tx_ring[entry].frag[i+1].length = cpu_to_le32(skb_frag_size(frag)|LAST_FRAG);
                         else
-                                        vp->tx_ring[entry].frag[i+1].length = cpu_to_le32(frag->size);
+                                        vp->tx_ring[entry].frag[i+1].length = cpu_to_le32(skb_frag_size(frag));
                 }
         }
 #else
diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c
index 11f8858c786d..20ea07508ac7 100644
--- a/drivers/net/ethernet/3com/typhoon.c
+++ b/drivers/net/ethernet/3com/typhoon.c
@@ -810,15 +810,15 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)
                 txd->frag.addrHi = 0;
                 first_txd->numDesc++;
 
-                for(i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-                        skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
+                for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
+                        const skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
                         void *frag_addr;
 
                         txd = (struct tx_desc *) (txRing->ringBase +
                                                 txRing->lastWrite);
                         typhoon_inc_tx_index(&txRing->lastWrite, 1);
 
-                        len = frag->size;
+                        len = skb_frag_size(frag);
                         frag_addr = skb_frag_address(frag);
                         skb_dma = pci_map_single(tp->tx_pdev, frag_addr, len,
                                          PCI_DMA_TODEVICE);