diff options
| author |  David S. Miller <davem@davemloft.net>
| 2011-09-16 02:58:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net>
| 2011-09-16 02:58:54 -0400 |
| commit | 986eaa904129fc888c6c3882f6405a0055110e51 (patch) | |
| tree | a3da29918fd82982703eab1e7ae07957a9e5c12c /drivers/net/ethernet/realtek | |
| parent | net: consolidate and fix ethtool_ops->get_settings calling (diff) | |
| parent | greth: convert to SKB paged frag API. (diff) | |
| download | linux-986eaa904129fc888c6c3882f6405a0055110e51.tar.gz linux-986eaa904129fc888c6c3882f6405a0055110e51.tar.bz2 linux-986eaa904129fc888c6c3882f6405a0055110e51.zip | |
Merge branch 'master' of ../netdev-next/
Diffstat (limited to 'drivers/net/ethernet/realtek')
| -rw-r--r-- | drivers/net/ethernet/realtek/8139cp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c index 5d2d1b8678f6..c77d5af676a1 100644 --- a/drivers/net/ethernet/realtek/8139cp.c +++ b/drivers/net/ethernet/realtek/8139cp.c @@ -784,8 +784,7 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb, len = this_frag->size; mapping = dma_map_single(&cp->pdev->dev, - ((void *) page_address(this_frag->page) + - this_frag->page_offset), + skb_frag_address(this_frag), len, PCI_DMA_TODEVICE); eor = (entry == (CP_TX_RING_SIZE - 1)) ? RingEnd : 0; |