]> git.hungrycats.org Git - linux/commitdiff
[PATCH] ppc64: Fix ibmveth.c compilation
authorAndrew Morton <akpm@osdl.org>
Tue, 13 Apr 2004 02:26:22 +0000 (19:26 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 13 Apr 2004 02:26:22 +0000 (19:26 -0700)
From: Paul Mackerras <paulus@samba.org>

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.

drivers/net/ibmveth.c

index 3da41374a127c408ef8fc6319091f8911725466c..c3836f6de58c91f5330ca004e68238ab7bb278bc 100644 (file)
@@ -641,7 +641,8 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
 
        /* 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 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
        /* 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;