From ecf19e36e9fb2f49bb1e468aea266bdf0283a70b Mon Sep 17 00:00:00 2001
From: Ian Campbell <Ian.Campbell@citrix.com>
Date: Mon, 29 Aug 2011 23:18:29 +0000
Subject: [PATCH] --- yaml --- r: 265777 b: refs/heads/master c:
 2234a722394cf5b9fdcbf5459678fdee450e54f4 h: refs/heads/master i:   265775:
 cde982bdf29726e2f2f68f389ae50313fe26a33d v: v3

---
 [refs]                                         |  2 +-
 trunk/drivers/net/ethernet/freescale/gianfar.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index e81afa329b75..d29e2db116f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 671173c30f53a5a39c63525540962c2b4a673749
+refs/heads/master: 2234a722394cf5b9fdcbf5459678fdee450e54f4
diff --git a/trunk/drivers/net/ethernet/freescale/gianfar.c b/trunk/drivers/net/ethernet/freescale/gianfar.c
index 81d409d08c97..83199fd0d62b 100644
--- a/trunk/drivers/net/ethernet/freescale/gianfar.c
+++ b/trunk/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;