Module Name: src
Committed By: christos
Date: Sun Mar 23 02:55:26 UTC 2014
Modified Files:
src/sys/compat/ndis: kern_ndis.c
Log Message:
remove unused
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/compat/ndis/kern_ndis.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/compat/ndis/kern_ndis.c
diff -u src/sys/compat/ndis/kern_ndis.c:1.24 src/sys/compat/ndis/kern_ndis.c:1.25
--- src/sys/compat/ndis/kern_ndis.c:1.24 Thu Sep 19 14:50:35 2013
+++ src/sys/compat/ndis/kern_ndis.c Sat Mar 22 22:55:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ndis.c,v 1.24 2013/09/19 18:50:35 christos Exp $ */
+/* $NetBSD: kern_ndis.c,v 1.25 2014/03/23 02:55:26 christos Exp $ */
/*-
* Copyright (c) 2003
@@ -37,7 +37,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.60.2.5 2005/04/01 17:14:20 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.24 2013/09/19 18:50:35 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.25 2014/03/23 02:55:26 christos Exp $");
#endif
#include <sys/param.h>
@@ -579,14 +579,11 @@ ndis_unsched(void (*func)(void *), void
{
struct ndis_req *r;
struct ndisqhead *q;
- struct proc *p;
if (t == NDIS_TASKQUEUE) {
q = &ndis_ttodo;
- p = ndis_tproc.np_p;
} else {
q = &ndis_itodo;
- p = ndis_iproc.np_p;
}
mtx_lock_spin(&ndis_thr_mtx);
@@ -1484,7 +1481,6 @@ ndis_set_info(void *arg, ndis_oid oid, v
ndis_handle adapter;
__stdcall ndis_setinfo_handler setfunc;
uint32_t byteswritten = 0, bytesneeded = 0;
- int error;
uint8_t irql = 0; /* XXX: gcc */
/*
@@ -1527,9 +1523,8 @@ ndis_set_info(void *arg, ndis_oid oid, v
if (rval == NDIS_STATUS_PENDING) {
mtx_lock(&ndis_req_mtx);
- error = mtsleep(&sc->ndis_block->nmb_setstat,
- PZERO | PNORELOCK,
- "ndisset", 5 * hz, &ndis_req_mtx);
+ mtsleep(&sc->ndis_block->nmb_setstat, PZERO | PNORELOCK,
+ "ndisset", 5 * hz, &ndis_req_mtx);
rval = sc->ndis_block->nmb_setstat;
}
@@ -1708,16 +1703,10 @@ ndis_reset_nic(void *arg)
ndis_handle adapter;
__stdcall ndis_reset_handler resetfunc;
uint8_t addressing_reset;
- struct ifnet *ifp;
int rval;
uint8_t irql = 0; /* XXX: gcc */
sc = arg;
-#ifdef __FreeBSD__
- ifp = &sc->arpcom.ac_if;
-#else
- ifp = &sc->arpcom.ec_if;
-#endif
adapter = sc->ndis_block->nmb_miniportadapterctx;
resetfunc = sc->ndis_chars->nmc_reset_func;
@@ -1746,14 +1735,8 @@ ndis_halt_nic(void *arg)
struct ndis_softc *sc;
ndis_handle adapter;
__stdcall ndis_halt_handler haltfunc;
- struct ifnet *ifp;
sc = arg;
-#ifdef __FreeBSD__
- ifp = &sc->arpcom.ac_if;
-#else
- ifp = &sc->arpcom.ec_if;
-#endif
NDIS_LOCK(sc);