net: add skb frag size accessors

[mirror_ubuntu-artful-kernel.git] / drivers / net / ethernet / sun / sungem.c

diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c
index 11fd299f5b990746c88362e3910405713cf7b71f..ceab215bb4a31f3f50b0c20465e2593f52385b4a 100644 (file)
--- a/drivers/net/ethernet/sun/sungem.c
+++ b/drivers/net/ethernet/sun/sungem.c
@@ -1065,16 +1065,14 @@ static netdev_tx_t gem_start_xmit(struct sk_buff *skb,
                entry = NEXT_TX(entry);
 
                for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
-                       skb_frag_t *this_frag = &skb_shinfo(skb)->frags[frag];
+                       const skb_frag_t *this_frag = &skb_shinfo(skb)->frags[frag];
                        u32 len;
                        dma_addr_t mapping;
                        u64 this_ctrl;
 
-                       len = this_frag->size;
-                       mapping = pci_map_page(gp->pdev,
-                                              this_frag->page,
-                                              this_frag->page_offset,
-                                              len, PCI_DMA_TODEVICE);
+                       len = skb_frag_size(this_frag);
+                       mapping = skb_frag_dma_map(&gp->pdev->dev, this_frag,
+                                                  0, len, DMA_TO_DEVICE);
                        this_ctrl = ctrl;
                        if (frag == skb_shinfo(skb)->nr_frags - 1)
                                this_ctrl |= TXDCTRL_EOF;