From 9808ff8e829ed14187e2073c71cc047fc989a60f Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 21 Sep 2011 21:53:20 +0000 Subject: [PATCH] --- yaml --- r: 266148 b: refs/heads/master c: f722380d25516aa9934014de7c8d7284da38aa1f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 85eb37b6a280..c1aa231d157a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0cd83cc020fdf9fcc56d9456d9978430f41873cf +refs/heads/master: f722380d25516aa9934014de7c8d7284da38aa1f diff --git a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index d0fbc5477d10..c0ee6b6b0198 100644 --- a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1113,9 +1113,8 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) desc = priv->dma_tx + entry; TX_DBG("\t[entry %d] segment len: %d\n", entry, len); - desc->des2 = dma_map_page(priv->device, frag->page, - frag->page_offset, - len, DMA_TO_DEVICE); + desc->des2 = skb_frag_dma_map(priv->device, frag, 0, len, + DMA_TO_DEVICE); priv->tx_skbuff[entry] = NULL; priv->hw->desc->prepare_tx_desc(desc, 0, len, csum_insertion); wmb();