summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/brocade
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-09-16 02:58:54 -0400
committerDavid S. Miller <davem@davemloft.net>2011-09-16 02:58:54 -0400
commit986eaa904129fc888c6c3882f6405a0055110e51 (patch)
treea3da29918fd82982703eab1e7ae07957a9e5c12c /drivers/net/ethernet/brocade
parent4bc71cb983fd2844e603bf633df2bb53385182d2 (diff)
parentab7e11d9d0293ef1802d6ae8aab39ce58472b167 (diff)
downloadlinux-986eaa904129fc888c6c3882f6405a0055110e51.tar.gz
linux-986eaa904129fc888c6c3882f6405a0055110e51.tar.bz2
linux-986eaa904129fc888c6c3882f6405a0055110e51.zip
Merge branch 'master' of ../netdev-next/
Diffstat (limited to 'drivers/net/ethernet/brocade')
-rw-r--r--drivers/net/ethernet/brocade/bna/bnad.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
index 3a409172992e..b7f96ab8b30c 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/drivers/net/ethernet/brocade/bna/bnad.c
@@ -2753,8 +2753,8 @@ bnad_start_xmit(struct sk_buff *skb, struct net_device *netdev)
BUG_ON(!(size <= BFI_TX_MAX_DATA_PER_VECTOR));
txqent->vector[vect_id].length = htons(size);
- dma_addr = dma_map_page(&bnad->pcidev->dev, frag->page,
- frag->page_offset, size, DMA_TO_DEVICE);
+ dma_addr = skb_frag_dma_map(&bnad->pcidev->dev, frag,
+ 0, size, DMA_TO_DEVICE);
dma_unmap_addr_set(&unmap_q->unmap_array[unmap_prod], dma_addr,
dma_addr);
BNA_SET_DMA_ADDR(dma_addr, &txqent->vector[vect_id].host_addr);