[PATCH] Make z8530.c build on 2.6

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.

diff -Nru a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c

--- a/drivers/net/wan/z85230.c	Wed Aug 13 13:17:33 2003
+++ b/drivers/net/wan/z85230.c	Wed Aug 13 13:17:33 2003

@@ -890,12 +890,12 @@
 	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 @@
 	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;
 

On Mer, 2003-08-13 at 21:25, Stephen Hemminger wrote:

Either we need to mark this driver (and the parts that use them) as BROKEN,
or at least get it building again.

It works fine.

-	c->rx_buf[0]=(void *)get_free_page(GFP_KERNEL|GFP_DMA);
+	c->rx_buf[0]=(void *)get_zeroed_page(GFP_KERNEL|GFP_DMA);

and doesn't need zeroed pages, I've just got no idea what 2.6 decided
to call the give me a free page function, fix that and it'll work fine.

(BTW its not one of the sangoma drivers but something I wrote originally
so Nenad isnt the guy to cc)

Alan Cox wrote:

and doesn't need zeroed pages, I've just got no idea what 2.6 decided
to call the give me a free page function, fix that and it'll work fine.

Look at 2.4 ;-)

include/linux/mm.h:#define get_free_page get_zeroed_page