diff options
| author | wpaul <wpaul@FreeBSD.org> | 2005-03-30 02:50:06 +0000 |
|---|---|---|
| committer | wpaul <wpaul@FreeBSD.org> | 2005-03-30 02:50:06 +0000 |
| commit | 0257351eba0e29394a17b8fbd9014968a2e21fa0 (patch) | |
| tree | f01b5a351da95b96f3bf82a84f4a43a975284ad1 /sys/compat/ndis/kern_ndis.c | |
| parent | 323b49a0112ebdafbf6834f7757849b911b94a09 (diff) | |
| download | FreeBSD-src-0257351eba0e29394a17b8fbd9014968a2e21fa0.zip FreeBSD-src-0257351eba0e29394a17b8fbd9014968a2e21fa0.tar.gz | |
Remove a couple of #ifdef 0'ed code blocks left over from Atheros debugging.
Remember to reset ndis_pendingreq to NULL when bailing out of
ndis_set_info() or ndis_get_info() due to miniportadapterctx not
being set.
Diffstat (limited to 'sys/compat/ndis/kern_ndis.c')
| -rw-r--r-- | sys/compat/ndis/kern_ndis.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sys/compat/ndis/kern_ndis.c b/sys/compat/ndis/kern_ndis.c index 0b8b737..3c512cc 100644 --- a/sys/compat/ndis/kern_ndis.c +++ b/sys/compat/ndis/kern_ndis.c @@ -1190,6 +1190,7 @@ ndis_set_info(arg, oid, buf, buflen) adapter = sc->ndis_block->nmb_miniportadapterctx; if (adapter == NULL || setfunc == NULL) { + sc->ndis_block->nmb_pendingreq = NULL; KeReleaseSpinLock(&sc->ndis_block->nmb_lock, irql); return(ENXIO); } @@ -1574,15 +1575,7 @@ ndis_isr(arg, ourintr, callhandler) if (adapter == NULL || isrfunc == NULL) return(ENXIO); -#ifdef notdef - if (NDIS_SERIALIZED(sc->ndis_block)) - mtx_lock(&sc->ndis_block->nmb_serialmtx); -#endif MSCALL3(isrfunc, &accepted, &queue, adapter); -#ifdef notdef - if (NDIS_SERIALIZED(sc->ndis_block)) - mtx_unlock(&sc->ndis_block->nmb_serialmtx); -#endif *ourintr = accepted; *callhandler = queue; @@ -1649,6 +1642,7 @@ ndis_get_info(arg, oid, buf, buflen) adapter = sc->ndis_block->nmb_miniportadapterctx; if (adapter == NULL || queryfunc == NULL) { + sc->ndis_block->nmb_pendingreq = NULL; KeReleaseSpinLock(&sc->ndis_block->nmb_lock, irql); return(ENXIO); } |
