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/intel/igb/igb_main.c | |
parent | net: consolidate and fix ethtool_ops->get_settings calling (diff) | |
parent | greth: convert to SKB paged frag API. (diff) | |
download | linux-dev-986eaa904129fc888c6c3882f6405a0055110e51.tar.xz linux-dev-986eaa904129fc888c6c3882f6405a0055110e51.zip |
Merge branch 'master' of ../netdev-next/
Diffstat (limited to 'drivers/net/ethernet/intel/igb/igb_main.c')
-rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 801608497409..3cb1bc96bf70 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -4174,10 +4174,7 @@ static inline int igb_tx_map_adv(struct igb_ring *tx_ring, struct sk_buff *skb, buffer_info->time_stamp = jiffies; buffer_info->next_to_watch = i; buffer_info->mapped_as_page = true; - buffer_info->dma = dma_map_page(dev, - frag->page, - frag->page_offset, - len, + buffer_info->dma = skb_frag_dma_map(dev, frag, 0, len, DMA_TO_DEVICE); if (dma_mapping_error(dev, buffer_info->dma)) goto dma_error; |