CVS commit: [netbsd-5-0] src/sys/dev/if_ndis

[Soren Jacobsen]

Module Name:    src
Committed By:   snj
Date:           Fri Aug 14 21:04:49 UTC 2009

Modified Files:
        src/sys/dev/if_ndis [netbsd-5-0]: if_ndis.c if_ndis_pci.c

Log Message:
Pull up following revision(s) (requested by dsl in ticket #888):
        sys/dev/if_ndis/if_ndis.c: revision 1.28
        sys/dev/if_ndis/if_ndis_pci.c: revision 1.16
Patch from PR/39034 - should make this compile!
I've not removed the mtx_destroy() since that has to be in there somewhere.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.16.1 src/sys/dev/if_ndis/if_ndis.c
cvs rdiff -u -r1.10 -r1.10.16.1 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.18 src/sys/dev/if_ndis/if_ndis.c:1.18.16.1
--- src/sys/dev/if_ndis/if_ndis.c:1.18	Tue Apr  8 06:12:21 2008
+++ src/sys/dev/if_ndis/if_ndis.c	Fri Aug 14 21:04:49 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.18 2008/04/08 06:12:21 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ndis.c,v 1.18.16.1 2009/08/14 21:04:49 snj Exp $");
 #endif
 
 #ifdef __FreeBSD__
@@ -332,7 +332,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;
@@ -693,7 +693,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);
 
@@ -2599,7 +2599,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.10 src/sys/dev/if_ndis/if_ndis_pci.c:1.10.16.1
--- src/sys/dev/if_ndis/if_ndis_pci.c:1.10	Tue Apr  8 06:12:21 2008
+++ src/sys/dev/if_ndis/if_ndis_pci.c	Fri Aug 14 21:04:49 2009
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ndis_pci.c,v 1.10 2008/04/08 06:12:21 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ndis_pci.c,v 1.10.16.1 2009/08/14 21:04:49 snj 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
@@ -653,7 +653,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");
 }
 #endif /* __NetBSD__ */