[LV-kern-commit] CVS: kernel-2.4/drivers/net vaxlance.c,1.10,1.11

[Andy P. <at...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/drivers/net
In directory usw-pr-cvs1:/tmp/cvs-serv31609/drivers/net

Modified Files:
	vaxlance.c 
Log Message:
implement DMA memory zone for ISA heritage peripherals. 
Tell vaxlance.c to use memory in DMA zone for now.



Index: vaxlance.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/vaxlance.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vaxlance.c	2001/03/07 02:15:34	1.10
+++ vaxlance.c	2001/06/16 14:05:30	1.11
@@ -347,7 +347,7 @@
 	ib->rx_ptr = leptr;
 
 #ifdef VAX_LANCE_DEBUG
-	printk("RX ptr: %8.8lx(%8.8x)\n", leptr, libdesc_offset(brx_ring, 0));
+	printk("RX ptr: %8.8lx(%8.8x)\n", leptr, ib->brx_ring);
 #endif    
 	/* Setup tx descriptor pointer */
 
@@ -357,7 +357,7 @@
 	ib->tx_ptr = leptr;
 
 #ifdef VAX_LANCE_DEBUG
-	printk("TX ptr: %8.8lx(%8.8x)\n", leptr, libdesc_offset(btx_ring, 0));
+	printk("TX ptr: %8.8lx(%8.8x)\n", leptr, ib->btx_ring);
 
 	printk("TX rings:\n");
 #endif
@@ -932,7 +932,9 @@
 	spin_lock_init(&lp->lock);
 
 	/* Need a block of 64KB */
-	dev->mem_start = __get_free_pages(GFP_KERNEL, 4);
+        /* At present, until we figure out the address extension 
+	 * parity control bit, ask for memory in the DMA zone */ 
+	dev->mem_start = __get_free_pages(GFP_DMA, 4);
 	if (!dev->mem_start) {
 		/* Shouldn't we free dev->priv here if dev was non-NULL on entry? */
 		return -ENOMEM;