From owner-freebsd-current@FreeBSD.ORG Mon Feb 28 16:29:16 2005 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1FA8316A4CE for ; Mon, 28 Feb 2005 16:29:16 +0000 (GMT) Received: from anuket.mj.niksun.com (gwnew.niksun.com [65.115.46.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 37F5843D49 for ; Mon, 28 Feb 2005 16:29:13 +0000 (GMT) (envelope-from jkim@niksun.com) Received: from [10.70.0.244] (daemon.mj.niksun.com [10.70.0.244]) by anuket.mj.niksun.com (8.13.1/8.12.11) with ESMTP id j1SGTCBX048318; Mon, 28 Feb 2005 11:29:12 -0500 (EST) (envelope-from jkim@niksun.com) From: Jung-uk Kim Organization: Niksun, Inc. To: freebsd-current@freebsd.org, racinej@mcmaster.ca Date: Mon, 28 Feb 2005 11:29:04 -0500 User-Agent: KMail/1.6.2 References: <1109510014.651.7.camel@localhost> In-Reply-To: <1109510014.651.7.camel@localhost> MIME-Version: 1.0 Content-Disposition: inline Content-Type: Multipart/Mixed; boundary="Boundary-00=_Qb0ICuV0JaPQE96" Message-Id: <200502281129.05201.jkim@niksun.com> X-Virus-Scanned: ClamAV 0.83/733/Mon Feb 28 03:03:39 2005 on anuket.mj.niksun.com X-Virus-Status: Clean Subject: Re: ndis bug in current... (2/25/05) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Feb 2005 16:29:16 -0000 --Boundary-00=_Qb0ICuV0JaPQE96 Content-Type: text/plain; charset="euc-kr" Content-Transfer-Encoding: 7bit Content-Disposition: inline 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 --Boundary-00=_Qb0ICuV0JaPQE96 Content-Type: text/plain; charset="euc-kr"; name="if_ndis.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="if_ndis.diff" 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); --Boundary-00=_Qb0ICuV0JaPQE96--