Commit ab7e11d9 authored by Ian Campbell's avatar Ian Campbell Committed by David S. Miller

greth: convert to SKB paged frag API.

In order to avoid long lines also use phys_to_virt(page_to_phys(page)) =>
page_address(page) (since the are effectively the same thing for lowmem pages).

Also dump the frag's size instead of the headlen when dumping a frag.
Signed-off-by: default avatarIan Campbell <ian.campbell@citrix.com>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2234a722
...@@ -113,9 +113,8 @@ static void greth_print_tx_packet(struct sk_buff *skb) ...@@ -113,9 +113,8 @@ static void greth_print_tx_packet(struct sk_buff *skb)
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
print_hex_dump(KERN_DEBUG, "TX: ", DUMP_PREFIX_OFFSET, 16, 1, print_hex_dump(KERN_DEBUG, "TX: ", DUMP_PREFIX_OFFSET, 16, 1,
phys_to_virt(page_to_phys(skb_shinfo(skb)->frags[i].page)) + skb_frag_address(&skb_shinfo(skb)->frags[i]),
skb_shinfo(skb)->frags[i].page_offset, skb_shinfo(skb)->frags[i].size, true);
length, true);
} }
} }
...@@ -528,10 +527,7 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev) ...@@ -528,10 +527,7 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev)
greth_write_bd(&bdp->stat, status); greth_write_bd(&bdp->stat, status);
dma_addr = dma_map_page(greth->dev, dma_addr = skb_frag_dma_map(greth->dev, frag, 0, frag->size,
frag->page,
frag->page_offset,
frag->size,
DMA_TO_DEVICE); DMA_TO_DEVICE);
if (unlikely(dma_mapping_error(greth->dev, dma_addr))) if (unlikely(dma_mapping_error(greth->dev, dma_addr)))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment