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>

4 files changed, 12 insertions, 12 deletions

diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
index e2ba78be1c2..8cf3173ba48 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
@@ -1905,13 +1905,13 @@ netxen_map_tx_skb(struct pci_dev *pdev,
                 frag = &skb_shinfo(skb)->frags[i];
                 nf = &pbuf->frag_array[i+1];
 
-                map = skb_frag_dma_map(&pdev->dev, frag, 0, frag->size,
+                map = skb_frag_dma_map(&pdev->dev, frag, 0, skb_frag_size(frag),
                                        DMA_TO_DEVICE);
                 if (dma_mapping_error(&pdev->dev, map))
                         goto unwind;
 
                 nf->dma = map;
-                nf->length = frag->size;
+                nf->length = skb_frag_size(frag);
         }
 
         return 0;
@@ -1962,7 +1962,7 @@ netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 
                 for (i = 0; i < (frag_count - NETXEN_MAX_FRAGS_PER_TX); i++) {
                         frag = &skb_shinfo(skb)->frags[i];
-                        delta += frag->size;
+                        delta += skb_frag_size(frag);
                 }
 
                 if (!__pskb_pull_tail(skb, delta))
diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c
index 46f9b6499f9..a4bdff438a5 100644
--- a/drivers/net/ethernet/qlogic/qla3xxx.c
+++ b/drivers/net/ethernet/qlogic/qla3xxx.c
@@ -2388,7 +2388,7 @@ static int ql_send_map(struct ql3_adapter *qdev,
                         seg++;
                 }
 
-                map = skb_frag_dma_map(&qdev->pdev->dev, frag, 0, frag->size,
+                map = skb_frag_dma_map(&qdev->pdev->dev, frag, 0, skb_frag_size(frag),
                                        DMA_TO_DEVICE);
 
                 err = dma_mapping_error(&qdev->pdev->dev, map);
@@ -2401,9 +2401,9 @@ static int ql_send_map(struct ql3_adapter *qdev,
 
                 oal_entry->dma_lo = cpu_to_le32(LS_64BITS(map));
                 oal_entry->dma_hi = cpu_to_le32(MS_64BITS(map));
-                oal_entry->len = cpu_to_le32(frag->size);
+                oal_entry->len = cpu_to_le32(skb_frag_size(frag));
                 dma_unmap_addr_set(&tx_cb->map[seg], mapaddr, map);
-                dma_unmap_len_set(&tx_cb->map[seg], maplen, frag->size);
+                dma_unmap_len_set(&tx_cb->map[seg], maplen, skb_frag_size(frag));
                 }
         /* Terminate the last segment. */
         oal_entry->len |= cpu_to_le32(OAL_LAST_ENTRY);
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index eac19e7d276..106503f118f 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -2135,13 +2135,13 @@ qlcnic_map_tx_skb(struct pci_dev *pdev,
                 frag = &skb_shinfo(skb)->frags[i];
                 nf = &pbuf->frag_array[i+1];
 
-                map = skb_frag_dma_map(&pdev->dev, frag, 0, frag->size,
+                map = skb_frag_dma_map(&pdev->dev, frag, 0, skb_frag_size(frag),
                                        DMA_TO_DEVICE);
                 if (dma_mapping_error(&pdev->dev, map))
                         goto unwind;
 
                 nf->dma = map;
-                nf->length = frag->size;
+                nf->length = skb_frag_size(frag);
         }
 
         return 0;
@@ -2221,7 +2221,7 @@ qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
         if (!skb_is_gso(skb) && frag_count > QLCNIC_MAX_FRAGS_PER_TX) {
 
                 for (i = 0; i < (frag_count - QLCNIC_MAX_FRAGS_PER_TX); i++)
-                        delta += skb_shinfo(skb)->frags[i].size;
+                        delta += skb_frag_size(&skb_shinfo(skb)->frags[i]);
 
                 if (!__pskb_pull_tail(skb, delta))
                         goto drop_packet;
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index f2d9bb78ec7..c92afcd912e 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -1431,7 +1431,7 @@ static int ql_map_send(struct ql_adapter *qdev,
                         map_idx++;
                 }
 
-                map = skb_frag_dma_map(&qdev->pdev->dev, frag, 0, frag->size,
+                map = skb_frag_dma_map(&qdev->pdev->dev, frag, 0, skb_frag_size(frag),
                                        DMA_TO_DEVICE);
 
                 err = dma_mapping_error(&qdev->pdev->dev, map);
@@ -1443,10 +1443,10 @@ static int ql_map_send(struct ql_adapter *qdev,
                 }
 
                 tbd->addr = cpu_to_le64(map);
-                tbd->len = cpu_to_le32(frag->size);
+                tbd->len = cpu_to_le32(skb_frag_size(frag));
                 dma_unmap_addr_set(&tx_ring_desc->map[map_idx], mapaddr, map);
                 dma_unmap_len_set(&tx_ring_desc->map[map_idx], maplen,
-                                  frag->size);
+                                  skb_frag_size(frag));
 
         }
         /* Save the number of segments we've mapped. */