Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
dsl 2009-08-02 20:22:34 +00:00
parent 18f2bbe96d
commit 14861af47a
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/if_ndis/if_ndis.c
View File

@ -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 @@ ndis_setmulti(struct ndis_softc *sc)
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 @@ ndis_attach(dev)
}
/* 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 @@ ndis_ioctl(struct ifnet *ifp, u_long command, void *data)
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;
}

5
sys/dev/if_ndis/if_ndis_pci.c
View File

@ -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 @@ void ndis_attach_pci(device_t parent, device_t self, void *aux)
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");
}