net: add skb frag size accessors

[pandora-kernel.git] / drivers / net / ethernet / qlogic / qlcnic / qlcnic_main.c

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index eac19e7..106503f 100644 (file)
--- 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;