aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/aeroflex/greth.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c
index a5f6b07f8f3..bc3bd34c43f 100644
--- a/drivers/net/ethernet/aeroflex/greth.c
+++ b/drivers/net/ethernet/aeroflex/greth.c
@@ -113,9 +113,8 @@ static void greth_print_tx_packet(struct sk_buff *skb)
113 for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { 113 for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
114 114
115 print_hex_dump(KERN_DEBUG, "TX: ", DUMP_PREFIX_OFFSET, 16, 1, 115 print_hex_dump(KERN_DEBUG, "TX: ", DUMP_PREFIX_OFFSET, 16, 1,
116 phys_to_virt(page_to_phys(skb_shinfo(skb)->frags[i].page)) + 116 skb_frag_address(&skb_shinfo(skb)->frags[i]),
117 skb_shinfo(skb)->frags[i].page_offset, 117 skb_shinfo(skb)->frags[i].size, true);
118 length, true);
119 } 118 }
120} 119}
121 120
@@ -528,11 +527,8 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev)
528 527
529 greth_write_bd(&bdp->stat, status); 528 greth_write_bd(&bdp->stat, status);
530 529
531 dma_addr = dma_map_page(greth->dev, 530 dma_addr = skb_frag_dma_map(greth->dev, frag, 0, frag->size,
532 frag->page, 531 DMA_TO_DEVICE);
533 frag->page_offset,
534 frag->size,
535 DMA_TO_DEVICE);
536 532
537 if (unlikely(dma_mapping_error(greth->dev, dma_addr))) 533 if (unlikely(dma_mapping_error(greth->dev, dma_addr)))
538 goto frag_map_error; 534 goto frag_map_error;