]> git.hungrycats.org Git - linux/commitdiff
[PATCH] Make z8530.c build on 2.6
authorStephen Hemminger <shemminger@osdl.org>
Sun, 17 Aug 2003 08:46:23 +0000 (04:46 -0400)
committerJeff Garzik <jgarzik@redhat.com>
Sun, 17 Aug 2003 08:46:23 +0000 (04:46 -0400)
Either we need to mark this driver (and the parts that use them) as BROKEN,
or at least get it building again.

With this it builds, but of course, I don't have the real hardware.

drivers/net/wan/z85230.c

index 45e4193454453521431f00b44409d09b9609ef84..607cd27c290502c3010e21fff7c2595833764812 100644 (file)
@@ -890,12 +890,12 @@ int z8530_sync_dma_open(struct net_device *dev, struct z8530_channel *c)
        if(c->mtu  > PAGE_SIZE/2)
                return -EMSGSIZE;
         
-       c->rx_buf[0]=(void *)get_free_page(GFP_KERNEL|GFP_DMA);
+       c->rx_buf[0]=(void *)get_zeroed_page(GFP_KERNEL|GFP_DMA);
        if(c->rx_buf[0]==NULL)
                return -ENOBUFS;
        c->rx_buf[1]=c->rx_buf[0]+PAGE_SIZE/2;
        
-       c->tx_dma_buf[0]=(void *)get_free_page(GFP_KERNEL|GFP_DMA);
+       c->tx_dma_buf[0]=(void *)get_zeroed_page(GFP_KERNEL|GFP_DMA);
        if(c->tx_dma_buf[0]==NULL)
        {
                free_page((unsigned long)c->rx_buf[0]);
@@ -1080,7 +1080,7 @@ int z8530_sync_txdma_open(struct net_device *dev, struct z8530_channel *c)
        if(c->mtu  > PAGE_SIZE/2)
                return -EMSGSIZE;
         
-       c->tx_dma_buf[0]=(void *)get_free_page(GFP_KERNEL|GFP_DMA);
+       c->tx_dma_buf[0]=(void *)get_zeroed_page(GFP_KERNEL|GFP_DMA);
        if(c->tx_dma_buf[0]==NULL)
                return -ENOBUFS;