From f040440fc1f895b3b5e24eda72bdca3959768215 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 24 Aug 2011 22:28:11 +0000 Subject: [PATCH] --- yaml --- r: 265552 b: refs/heads/master c: dc234d0b24e9639476969ece81d56dd7588e944a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/tg3.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1fc04b89dace..9c58d746a5d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5581be3b48914b0f9126b14daa02d334928322b0 +refs/heads/master: dc234d0b24e9639476969ece81d56dd7588e944a diff --git a/trunk/drivers/net/ethernet/broadcom/tg3.c b/trunk/drivers/net/ethernet/broadcom/tg3.c index 0f811115fe2a..a7e28a2c5348 100644 --- a/trunk/drivers/net/ethernet/broadcom/tg3.c +++ b/trunk/drivers/net/ethernet/broadcom/tg3.c @@ -6311,10 +6311,8 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; len = frag->size; - mapping = pci_map_page(tp->pdev, - frag->page, - frag->page_offset, - len, PCI_DMA_TODEVICE); + mapping = skb_frag_dma_map(&tp->pdev->dev, frag, 0, + len, PCI_DMA_TODEVICE); tnapi->tx_buffers[entry].skb = NULL; dma_unmap_addr_set(&tnapi->tx_buffers[entry], mapping,