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/ixgb/ixgb_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/ixgb/ixgb_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgb/ixgb_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c index b8ef2c0fc5d0..c8b9c9028bc0 100644 --- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c +++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c @@ -1341,7 +1341,7 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb, frag = &skb_shinfo(skb)->frags[f]; len = frag->size; - offset = frag->page_offset; + offset = 0; while (len) { i++; @@ -1361,8 +1361,8 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb, buffer_info->time_stamp = jiffies; buffer_info->mapped_as_page = true; buffer_info->dma = - dma_map_page(&pdev->dev, frag->page, - offset, size, DMA_TO_DEVICE); + skb_frag_dma_map(&pdev->dev, frag, offset, size, + DMA_TO_DEVICE); if (dma_mapping_error(&pdev->dev, buffer_info->dma)) goto dma_error; buffer_info->next_to_watch = 0; |