From 6e4625a3072a7ee8db7d70692652b7fb83985385 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 10 Oct 2011 01:11:39 +0000 Subject: [PATCH] --- yaml --- r: 266484 b: refs/heads/master c: f8f114c26452059e03fb970141e5795e08015217 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/ibm/emac/core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4475b63bf769..8519644e986e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 618c4a0ad41a42edd4f06259623f78f2e8da66e8 +refs/heads/master: f8f114c26452059e03fb970141e5795e08015217 diff --git a/trunk/drivers/net/ethernet/ibm/emac/core.c b/trunk/drivers/net/ethernet/ibm/emac/core.c index a573df1fafb6..6b3a033d9de5 100644 --- a/trunk/drivers/net/ethernet/ibm/emac/core.c +++ b/trunk/drivers/net/ethernet/ibm/emac/core.c @@ -1458,8 +1458,8 @@ static int emac_start_xmit_sg(struct sk_buff *skb, struct net_device *ndev) if (unlikely(dev->tx_cnt + mal_tx_chunks(len) >= NUM_TX_BUFF)) goto undo_frame; - pd = dma_map_page(&dev->ofdev->dev, frag->page, frag->page_offset, len, - DMA_TO_DEVICE); + pd = skb_frag_dma_map(&dev->ofdev->dev, frag, 0, len, + DMA_TO_DEVICE); slot = emac_xmit_split(dev, slot, pd, len, i == nr_frags - 1, ctrl);