Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / net / ethernet / freescale / gianfar.c

diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index 81d409d..83199fd 100644 (file)
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -2140,11 +2140,11 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
                        if (i == nr_frags - 1)
                                lstatus |= BD_LFLAG(TXBD_LAST | TXBD_INTERRUPT);
 
-                       bufaddr = dma_map_page(&priv->ofdev->dev,
-                                       skb_shinfo(skb)->frags[i].page,
-                                       skb_shinfo(skb)->frags[i].page_offset,
-                                       length,
-                                       DMA_TO_DEVICE);
+                       bufaddr = skb_frag_dma_map(&priv->ofdev->dev,
+                                                  &skb_shinfo(skb)->frags[i],
+                                                  0,
+                                                  length,
+                                                  DMA_TO_DEVICE);
 
                        /* set the TxBD length and buffer pointer */
                        txbdp->bufPtr = bufaddr;