public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Fix ibmveth.c compilation
@ 2004-04-13  9:19 Paul Mackerras
  2004-04-13 16:32 ` Jeff Garzik
  0 siblings, 1 reply; 2+ messages in thread
From: Paul Mackerras @ 2004-04-13  9:19 UTC (permalink / raw)
  To: Andrew Morton; +Cc: boutcher, linux-kernel

This patch changes PCI_DMA_TODEVICE to DMA_TO_DEVICE in a couple of
places in drivers/net/ibmveth.c, since it doesn't compile without this
change and it does compile with it.  It also reformats a couple of
over-long lines in the vicinity of the other changes.

Please apply.

Thanks,
Paul.

diff -urN linux-2.5/drivers/net/ibmveth.c test25/drivers/net/ibmveth.c
--- linux-2.5/drivers/net/ibmveth.c	2004-04-13 09:25:10.027576720 +1000
+++ test25/drivers/net/ibmveth.c	2004-04-13 18:37:04.966522224 +1000
@@ -641,7 +641,8 @@
 
 	/* map the initial fragment */
 	desc[0].fields.length  = nfrags ? skb->len - skb->data_len : skb->len;
-	desc[0].fields.address = vio_map_single(adapter->vdev, skb->data, desc[0].fields.length, PCI_DMA_TODEVICE);
+	desc[0].fields.address = vio_map_single(adapter->vdev, skb->data,
+					desc[0].fields.length, DMA_TO_DEVICE);
 	desc[0].fields.valid   = 1;
 
 	if(dma_mapping_error(desc[0].fields.address)) {
@@ -657,9 +658,10 @@
 	/* map fragments past the initial portion if there are any */
 	while(curfrag--) {
 		skb_frag_t *frag = &skb_shinfo(skb)->frags[curfrag];
-		desc[curfrag+1].fields.address = vio_map_single(adapter->vdev,
-								page_address(frag->page) + frag->page_offset,
-								frag->size, PCI_DMA_TODEVICE);
+		desc[curfrag+1].fields.address
+			= vio_map_single(adapter->vdev,
+				page_address(frag->page) + frag->page_offset,
+				frag->size, DMA_TO_DEVICE);
 		desc[curfrag+1].fields.length = frag->size;
 		desc[curfrag+1].fields.valid  = 1;
 

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] Fix ibmveth.c compilation
  2004-04-13  9:19 [PATCH] Fix ibmveth.c compilation Paul Mackerras
@ 2004-04-13 16:32 ` Jeff Garzik
  0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2004-04-13 16:32 UTC (permalink / raw)
  To: Paul Mackerras; +Cc: Andrew Morton, boutcher, linux-kernel

Paul Mackerras wrote:
> This patch changes PCI_DMA_TODEVICE to DMA_TO_DEVICE in a couple of
> places in drivers/net/ibmveth.c, since it doesn't compile without this
> change and it does compile with it.  It also reformats a couple of
> over-long lines in the vicinity of the other changes.
> 
> Please apply.

ACK



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2004-04-13 16:32 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-04-13  9:19 [PATCH] Fix ibmveth.c compilation Paul Mackerras
2004-04-13 16:32 ` Jeff Garzik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox