Module Name: src Committed By: dsl Date: Sun Aug 2 20:22:34 UTC 2009
Modified Files: src/sys/dev/if_ndis: if_ndis.c if_ndis_pci.c Log Message: Patch from PR/39034 - should make this compile! I've not removed the mtx_destroy() since that has to be in there somewhere. Patch may apply to netbsd 5.0 To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/dev/if_ndis/if_ndis.c cvs rdiff -u -r1.15 -r1.16 src/sys/dev/if_ndis/if_ndis_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/if_ndis/if_ndis.c diff -u src/sys/dev/if_ndis/if_ndis.c:1.27 src/sys/dev/if_ndis/if_ndis.c:1.28 --- src/sys/dev/if_ndis/if_ndis.c:1.27 Sat Apr 18 14:58:03 2009 +++ src/sys/dev/if_ndis/if_ndis.c Sun Aug 2 20:22:34 2009 @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.69.2.6 2005/03/31 04:24:36 wpaul Exp $"); #endif #ifdef __NetBSD__ -__KERNEL_RCSID(0, "$NetBSD: if_ndis.c,v 1.27 2009/04/18 14:58:03 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ndis.c,v 1.28 2009/08/02 20:22:34 dsl Exp $"); #endif @@ -253,7 +253,7 @@ error = ndis_set_info(sc, OID_GEN_CURRENT_PACKET_FILTER, &sc->ndis_filter, &len); if (error) { - aprint_error_dev(sc->ndif_dev, "set filter failed: %d\n", + aprint_error_dev(sc->ndis_dev, "set filter failed: %d\n", error); } return; @@ -550,7 +550,7 @@ } /* Tell the user what version of the API the driver is using. */ - aprint_normal_dev(&sc->ndis_dev, "NDIS API version: %d.%d\n", + aprint_normal_dev(sc->ndis_dev, "NDIS API version: %d.%d\n", sc->ndis_chars->nmc_version_major, sc->ndis_chars->nmc_version_minor); @@ -2129,7 +2129,7 @@ error = ifmedia_ioctl(ifp, ifr, &sc->ifmedia, command); break; case SIOCSIFCAP: - if ((error = ether_ioctl(ifp, cmd, data)) == ENETRESET) { + if ((error = ether_ioctl(ifp, command, data)) == ENETRESET) { ndis_set_offload(sc); error = 0; } Index: src/sys/dev/if_ndis/if_ndis_pci.c diff -u src/sys/dev/if_ndis/if_ndis_pci.c:1.15 src/sys/dev/if_ndis/if_ndis_pci.c:1.16 --- src/sys/dev/if_ndis/if_ndis_pci.c:1.15 Tue May 12 14:28:22 2009 +++ src/sys/dev/if_ndis/if_ndis_pci.c Sun Aug 2 20:22:34 2009 @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ndis_pci.c,v 1.15 2009/05/12 14:28:22 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ndis_pci.c,v 1.16 2009/08/02 20:22:34 dsl Exp $"); #ifdef __FreeBSD__ __FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pci.c,v 1.8.2.3 2005/03/31 04:24:36 wpaul Exp $"); #endif @@ -369,7 +369,8 @@ sc->ndis_rl = rl; sc->ndis_rescnt = rl->cprl_count; - kthread_create(ndis_attach, (void *)sc); + kthread_create(PRI_NONE, 0, NULL, ndis_attach, (void *)sc, + NULL, "ndis_attach"); }