diff options
author | Ian Campbell <Ian.Campbell@citrix.com> | 2011-08-29 19:18:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-08-30 17:58:02 -0400 |
commit | 4bf5adbf757565d2cc19758aec8452e5364dd700 (patch) | |
tree | 206c1cb1896d1a1e8e920c8f3ff2616950332de6 /drivers/net/ethernet/cisco | |
parent | 877749bf3f2f7a517ae74cd2c2fa4eed7aa9b51d (diff) |
enic: convert to SKB paged frag API.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Christian Benvenuti <benve@cisco.com>
Cc: Vasanthy Kolluri <vkolluri@cisco.com>
Cc: Roopa Prabhu <roprabhu@cisco.com>
Cc: David Wang <dwang2@cisco.com>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cisco')
-rw-r--r-- | drivers/net/ethernet/cisco/enic/enic_main.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index c751c25d301e..19c9272b8f12 100644 --- a/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/drivers/net/ethernet/cisco/enic/enic_main.c | |||
@@ -591,9 +591,9 @@ static inline void enic_queue_wq_skb_cont(struct enic *enic, | |||
591 | for (frag = skb_shinfo(skb)->frags; len_left; frag++) { | 591 | for (frag = skb_shinfo(skb)->frags; len_left; frag++) { |
592 | len_left -= frag->size; | 592 | len_left -= frag->size; |
593 | enic_queue_wq_desc_cont(wq, skb, | 593 | enic_queue_wq_desc_cont(wq, skb, |
594 | pci_map_page(enic->pdev, frag->page, | 594 | skb_frag_dma_map(&enic->pdev->dev, |
595 | frag->page_offset, frag->size, | 595 | frag, 0, frag->size, |
596 | PCI_DMA_TODEVICE), | 596 | PCI_DMA_TODEVICE), |
597 | frag->size, | 597 | frag->size, |
598 | (len_left == 0), /* EOP? */ | 598 | (len_left == 0), /* EOP? */ |
599 | loopback); | 599 | loopback); |
@@ -705,14 +705,14 @@ static inline void enic_queue_wq_skb_tso(struct enic *enic, | |||
705 | for (frag = skb_shinfo(skb)->frags; len_left; frag++) { | 705 | for (frag = skb_shinfo(skb)->frags; len_left; frag++) { |
706 | len_left -= frag->size; | 706 | len_left -= frag->size; |
707 | frag_len_left = frag->size; | 707 | frag_len_left = frag->size; |
708 | offset = frag->page_offset; | 708 | offset = 0; |
709 | 709 | ||
710 | while (frag_len_left) { | 710 | while (frag_len_left) { |
711 | len = min(frag_len_left, | 711 | len = min(frag_len_left, |
712 | (unsigned int)WQ_ENET_MAX_DESC_LEN); | 712 | (unsigned int)WQ_ENET_MAX_DESC_LEN); |
713 | dma_addr = pci_map_page(enic->pdev, frag->page, | 713 | dma_addr = skb_frag_dma_map(&enic->pdev->dev, frag, |
714 | offset, len, | 714 | offset, len, |
715 | PCI_DMA_TODEVICE); | 715 | PCI_DMA_TODEVICE); |
716 | enic_queue_wq_desc_cont(wq, skb, | 716 | enic_queue_wq_desc_cont(wq, skb, |
717 | dma_addr, | 717 | dma_addr, |
718 | len, | 718 | len, |