netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Make z8530.c build on 2.6
@ 2003-08-13 20:25 Stephen Hemminger
  2003-08-13 22:23 ` Alan Cox
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Hemminger @ 2003-08-13 20:25 UTC (permalink / raw)
  To: Alan Cox, Jeff Garzik, Nenad Corbic; +Cc: netdev

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;
 

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

end of thread, other threads:[~2003-08-13 22:28 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-08-13 20:25 [PATCH] Make z8530.c build on 2.6 Stephen Hemminger
2003-08-13 22:23 ` Alan Cox
2003-08-13 22:28   ` Jeff Garzik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).