ndis bug in current... (2/25/05)

[Jung-uk Kim]

On Sunday 27 February 2005 08:13 am, Jeffrey Racine wrote:
> Hi.
>
> The ndis driver no longer compiles... any suggestions most welcome.

Please try the attached (trivial) patch.

Jung-uk Kim

> -- Jeff
-------------- next part --------------
Index: if_ndis.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/if_ndis/if_ndis.c,v
retrieving revision 1.81
diff -u -r1.81 if_ndis.c
--- if_ndis.c	24 Feb 2005 22:54:14 -0000	1.81
+++ if_ndis.c	28 Feb 2005 16:26:23 -0000
@@ -479,11 +479,11 @@
 	/* Find the PDO for this device instance. */
 
 	if (sc->ndis_iftype == PCIBus)
-		pdrv = windrv_lookup(NULL, "PCI Bus");
+		pdrv = windrv_lookup((vm_offset_t)NULL, "PCI Bus");
 	else if (sc->ndis_iftype == PCMCIABus)
-		pdrv = windrv_lookup(NULL, "PCCARD Bus");
+		pdrv = windrv_lookup((vm_offset_t)NULL, "PCCARD Bus");
 	else
-		pdrv = windrv_lookup(NULL, "USB Bus");
+		pdrv = windrv_lookup((vm_offset_t)NULL, "USB Bus");
 	pdo = windrv_find_pdo(pdrv, dev);
 
 	/*
@@ -876,11 +876,11 @@
 	/* Destroy the PDO for this device. */
 	
 	if (sc->ndis_iftype == PCIBus)
-		drv = windrv_lookup(NULL, "PCI Bus");
+		drv = windrv_lookup((vm_offset_t)NULL, "PCI Bus");
 	else if (sc->ndis_iftype == PCMCIABus)
-		drv = windrv_lookup(NULL, "PCCARD Bus");
+		drv = windrv_lookup((vm_offset_t)NULL, "PCCARD Bus");
 	else
-		drv = windrv_lookup(NULL, "USB Bus");
+		drv = windrv_lookup((vm_offset_t)NULL, "USB Bus");
 	if (drv == NULL)
 		panic("couldn't find driver object");
 	windrv_destroy_pdo(drv, dev);
Index: if_ndis_pci.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/if_ndis/if_ndis_pci.c,v
retrieving revision 1.11
diff -u -r1.11 if_ndis_pci.c
--- if_ndis_pci.c	24 Feb 2005 21:49:14 -0000	1.11
+++ if_ndis_pci.c	28 Feb 2005 16:26:23 -0000
@@ -147,7 +147,7 @@
 	driver_object		*drv;
 
 	t = ndis_devs;
-	drv = windrv_lookup(NULL, "PCI Bus");
+	drv = windrv_lookup((vm_offset_t)NULL, "PCI Bus");
 
 	if (drv == NULL)
 		return(ENXIO);