From 791f46fa8e53a930ec98e1538f178fd896732633 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 21 Sep 2011 21:53:21 +0000 Subject: [PATCH] --- yaml --- r: 266149 b: refs/heads/master c: 4fee78b49ca0a3b7ad8fd71ba0b7faed746875f1 h: refs/heads/master i: 266147: 0ec66bf27c9731bb5b27c50ad43afad6539cf255 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/sun/sungem.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c1aa231d157a..3134cbd36668 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f722380d25516aa9934014de7c8d7284da38aa1f +refs/heads/master: 4fee78b49ca0a3b7ad8fd71ba0b7faed746875f1 diff --git a/trunk/drivers/net/ethernet/sun/sungem.c b/trunk/drivers/net/ethernet/sun/sungem.c index 11fd299f5b99..2bfa1715fe23 100644 --- a/trunk/drivers/net/ethernet/sun/sungem.c +++ b/trunk/drivers/net/ethernet/sun/sungem.c @@ -1071,10 +1071,8 @@ static netdev_tx_t gem_start_xmit(struct sk_buff *skb, u64 this_ctrl; len = this_frag->size; - mapping = pci_map_page(gp->pdev, - this_frag->page, - this_frag->page_offset, - len, PCI_DMA_TODEVICE); + mapping = skb_frag_dma_map(&gp->pdev->dev, this_frag, + 0, len, PCI_DMA_TODEVICE); this_ctrl = ctrl; if (frag == skb_shinfo(skb)->nr_frags - 1) this_ctrl |= TXDCTRL_EOF;