net: add skb frag size accessors

[pandora-kernel.git] / drivers / net / ethernet / pasemi / pasemi_mac.c

diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.c b/drivers/net/ethernet/pasemi/pasemi_mac.c
index c6f0056..49b549f 100644 (file)
--- a/drivers/net/ethernet/pasemi/pasemi_mac.c
+++ b/drivers/net/ethernet/pasemi/pasemi_mac.c
@@ -300,9 +300,9 @@ static int pasemi_mac_unmap_tx_skb(struct pasemi_mac *mac,
        pci_unmap_single(pdev, dmas[0], skb_headlen(skb), PCI_DMA_TODEVICE);
 
        for (f = 0; f < nfrags; f++) {
-               skb_frag_t *frag = &skb_shinfo(skb)->frags[f];
+               const skb_frag_t *frag = &skb_shinfo(skb)->frags[f];
 
-               pci_unmap_page(pdev, dmas[f+1], frag->size, PCI_DMA_TODEVICE);
+               pci_unmap_page(pdev, dmas[f+1], skb_frag_size(frag), PCI_DMA_TODEVICE);
        }
        dev_kfree_skb_irq(skb);
 
@@ -1506,8 +1506,8 @@ static int pasemi_mac_start_tx(struct sk_buff *skb, struct net_device *dev)
                skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
 
                map[i + 1] = skb_frag_dma_map(&mac->dma_pdev->dev, frag, 0,
-                                             frag->size, DMA_TO_DEVICE);
-               map_size[i+1] = frag->size;
+                                             skb_frag_size(frag), DMA_TO_DEVICE);
+               map_size[i+1] = skb_frag_size(frag);
                if (dma_mapping_error(&mac->dma_pdev->dev, map[i + 1])) {
                        nfrags = i;
                        goto out_err_nolock;