aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/3com
diff options
context:
space:
mode:
authorDavid S. Miller2011-09-16 02:58:54 -0400
committerDavid S. Miller2011-09-16 02:58:54 -0400
commit986eaa904129fc888c6c3882f6405a0055110e51 (patch)
treea3da29918fd82982703eab1e7ae07957a9e5c12c /drivers/net/ethernet/3com
parent4bc71cb983fd2844e603bf633df2bb53385182d2 (diff)
parentab7e11d9d0293ef1802d6ae8aab39ce58472b167 (diff)
Merge branch 'master' of ../netdev-next/
Diffstat (limited to 'drivers/net/ethernet/3com')
-rw-r--r--drivers/net/ethernet/3com/3c59x.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
index 6e1f5959a654..9ca45dcba755 100644
--- a/drivers/net/ethernet/3com/3c59x.c
+++ b/drivers/net/ethernet/3com/3c59x.c
@@ -2179,9 +2179,10 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev)
skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
vp->tx_ring[entry].frag[i+1].addr =
- cpu_to_le32(pci_map_single(VORTEX_PCI(vp),
- (void*)page_address(frag->page) + frag->page_offset,
- frag->size, PCI_DMA_TODEVICE));
+ cpu_to_le32(pci_map_single(
+ VORTEX_PCI(vp),
+ (void *)skb_frag_address(frag),
+ frag->size, PCI_DMA_TODEVICE));
if (i == skb_shinfo(skb)->nr_frags-1)
vp->tx_ring[entry].frag[i+1].length = cpu_to_le32(frag->size|LAST_FRAG);