upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- In ndis_intr(), don't do any interrupt processing if the IFF_UP

Browse source 
flag isn't set.
- In ndis_attach(), halt the NIC before exiting the routine. Calling
  ndis_init() will bring it up again, and we don't want it running
  (and potentially generating interrupts) until we're ready to deal
  with it.
This commit is contained in:
Bill Paul 2003-12-25 09:44:49 +00:00
parent 72b926ae1a
commit e237b45890
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sys/dev/if_ndis/if_ndis.c
View file

@ -566,6 +566,9 @@ fail:
if (error)
ndis_detach(dev);
/* We're done talking to the NIC for now; halt it. */
ndis_halt_nic(sc);
return(error);
}
@ -587,13 +590,13 @@ ndis_detach(dev)
KASSERT(mtx_initialized(&sc->ndis_mtx), ("ndis mutex not initialized"));
NDIS_LOCK(sc);
ifp = &sc->arpcom.ac_if;
ifp->if_flags &= ~IFF_UP;
if (device_is_attached(dev)) {
if (sc->ndis_80211) {
ifmedia_removeall(&sc->ic.ic_media);
ieee80211_node_detach(ifp);
}
ifp->if_flags &= ~IFF_UP;
NDIS_UNLOCK(sc);
ndis_stop(sc);
ether_ifdetach(ifp);
@ -761,15 +764,11 @@ ndis_intr(arg)
int call_isr = 0;
sc = arg;
/*NDIS_LOCK(sc);*/
ifp = &sc->arpcom.ac_if;
/*
if (!(ifp->if_flags & IFF_UP)) {
NDIS_UNLOCK(sc);
if (!(ifp->if_flags & IFF_UP))
return;
}
*/
ndis_isr(sc, &is_our_intr, &call_isr);
if (is_our_intr || call_isr)
@ -778,8 +777,6 @@ ndis_intr(arg)
if (ifp->if_snd.ifq_head != NULL)
ndis_start(ifp);
/*NDIS_UNLOCK(sc);*/
return;
}