The DEVICE_POLLING dereference of sc->tsec_ifp needs to be checked for null
first or this will panic. Condense three blocks that check sc->tsec_ifp into one while I am here.
This commit is contained in:
parent
9a36eaa36e
commit
335181759e
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=235144
@ -289,17 +289,17 @@ int
|
||||
tsec_detach(struct tsec_softc *sc)
|
||||
{
|
||||
|
||||
if (sc->tsec_ifp != NULL) {
|
||||
#ifdef DEVICE_POLLING
|
||||
if (sc->tsec_ifp->if_capenable & IFCAP_POLLING)
|
||||
ether_poll_deregister(sc->tsec_ifp);
|
||||
if (sc->tsec_ifp->if_capenable & IFCAP_POLLING)
|
||||
ether_poll_deregister(sc->tsec_ifp);
|
||||
#endif
|
||||
|
||||
/* Stop TSEC controller and free TX queue */
|
||||
if (sc->sc_rres && sc->tsec_ifp)
|
||||
tsec_shutdown(sc->dev);
|
||||
/* Stop TSEC controller and free TX queue */
|
||||
if (sc->sc_rres)
|
||||
tsec_shutdown(sc->dev);
|
||||
|
||||
/* Detach network interface */
|
||||
if (sc->tsec_ifp) {
|
||||
/* Detach network interface */
|
||||
ether_ifdetach(sc->tsec_ifp);
|
||||
if_free(sc->tsec_ifp);
|
||||
sc->tsec_ifp = NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user