diff options
| author | David S. Miller <davem@davemloft.net> | 2011-09-16 02:58:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-09-16 02:58:54 -0400 |
| commit | 986eaa904129fc888c6c3882f6405a0055110e51 (patch) | |
| tree | a3da29918fd82982703eab1e7ae07957a9e5c12c /drivers/net/ethernet/freescale | |
| parent | 4bc71cb983fd2844e603bf633df2bb53385182d2 (diff) | |
| parent | ab7e11d9d0293ef1802d6ae8aab39ce58472b167 (diff) | |
| download | lwn-986eaa904129fc888c6c3882f6405a0055110e51.tar.gz lwn-986eaa904129fc888c6c3882f6405a0055110e51.zip | |
Merge branch 'master' of ../netdev-next/
Diffstat (limited to 'drivers/net/ethernet/freescale')
| -rw-r--r-- | drivers/net/ethernet/freescale/gianfar.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index 81d409d08c97..83199fd0d62b 100644 --- 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; |