| Message ID | 1317810532-24984-1-git-send-email-ian.campbell@citrix.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
2011/10/5 Ian Campbell <ian.campbell@citrix.com>: [...] > --- a/drivers/net/ethernet/neterion/vxge/vxge-main.c > +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c > @@ -923,9 +923,9 @@ vxge_xmit(struct sk_buff *skb, struct net_device *dev) > if (!frag->size) > continue; > > - dma_pointer = (u64) pci_map_page(fifo->pdev, frag->page, > - frag->page_offset, frag->size, > - PCI_DMA_TODEVICE); > + dma_pointer = (u64)skb_frag_dma_map(&fifo->pdev->dev, frag, > + 0, frag->size, > + PCI_DMA_TODEVICE); This should be DMA_TO_DEVICE instead of PCI_DMA_TODEVICE. > > if (unlikely(pci_dma_mapping_error(fifo->pdev, dma_pointer))) > goto _exit2; I would also change this to dma_mapping_error() in one go. Just a random patch check. Best Regards, Michał Mirosław -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Michał Mirosław <mirqus@gmail.com> Date: Wed, 5 Oct 2011 23:03:27 +0200 > 2011/10/5 Ian Campbell <ian.campbell@citrix.com>: > [...] >> --- a/drivers/net/ethernet/neterion/vxge/vxge-main.c >> +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c >> @@ -923,9 +923,9 @@ vxge_xmit(struct sk_buff *skb, struct net_device *dev) >> if (!frag->size) >> continue; >> >> - dma_pointer = (u64) pci_map_page(fifo->pdev, frag->page, >> - frag->page_offset, frag->size, >> - PCI_DMA_TODEVICE); >> + dma_pointer = (u64)skb_frag_dma_map(&fifo->pdev->dev, frag, >> + 0, frag->size, >> + PCI_DMA_TODEVICE); > > This should be DMA_TO_DEVICE instead of PCI_DMA_TODEVICE. > >> >> if (unlikely(pci_dma_mapping_error(fifo->pdev, dma_pointer))) >> goto _exit2; > > I would also change this to dma_mapping_error() in one go. > > Just a random patch check. I'll make these adjustments when I apply this patch, thanks.
On Wed, 2011-10-05 at 22:03 +0100, Michał Mirosław wrote: > 2011/10/5 Ian Campbell <ian.campbell@citrix.com>: > [...] > > --- a/drivers/net/ethernet/neterion/vxge/vxge-main.c > > +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c > > @@ -923,9 +923,9 @@ vxge_xmit(struct sk_buff *skb, struct net_device *dev) > > if (!frag->size) > > continue; > > > > - dma_pointer = (u64) pci_map_page(fifo->pdev, frag->page, > > - frag->page_offset, frag->size, > > - PCI_DMA_TODEVICE); > > + dma_pointer = (u64)skb_frag_dma_map(&fifo->pdev->dev, frag, > > + 0, frag->size, > > + PCI_DMA_TODEVICE); > > This should be DMA_TO_DEVICE instead of PCI_DMA_TODEVICE. > > > > > if (unlikely(pci_dma_mapping_error(fifo->pdev, dma_pointer))) > > goto _exit2; > > I would also change this to dma_mapping_error() in one go. > > Just a random patch check. Thanks Michał. I'm sure I must have made the same mistakes in a whole bunch of patches which have already been applied. I'll knock up a fixup patch. Cheers, Ian. > > Best Regards, > Michał Mirosław -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c index ef1ba204..7420e19 100644 --- a/drivers/net/ethernet/neterion/vxge/vxge-main.c +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c @@ -923,9 +923,9 @@ vxge_xmit(struct sk_buff *skb, struct net_device *dev) if (!frag->size) continue; - dma_pointer = (u64) pci_map_page(fifo->pdev, frag->page, - frag->page_offset, frag->size, - PCI_DMA_TODEVICE); + dma_pointer = (u64)skb_frag_dma_map(&fifo->pdev->dev, frag, + 0, frag->size, + PCI_DMA_TODEVICE); if (unlikely(pci_dma_mapping_error(fifo->pdev, dma_pointer))) goto _exit2;
Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Cc: Jon Mason <jdmason@kudzu.us> Cc: netdev@vger.kernel.org --- drivers/net/ethernet/neterion/vxge/vxge-main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)