d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The DEVICE_POLLING dereference of sc->tsec_ifp needs to be checked for null

Browse Source 
first or this will panic. Condense three blocks that check sc->tsec_ifp into
one while I am here.
This commit is contained in:
thompsa 2012-05-08 21:09:03 +00:00
parent 27d9e6e27d
commit 6bb78e3c4c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/tsec/if_tsec.c
View File

@ -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;