diff options
| author | adrian <adrian@FreeBSD.org> | 2012-04-17 04:52:57 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2012-04-17 04:52:57 +0000 |
| commit | ab4c20c69dcd70561b35fcc954291a80344aaa79 (patch) | |
| tree | c713fb4558f2f0becea9c6ea101c699c132a78be /sys/dev | |
| parent | c5d2215f582afcc79ee34a84f0971febffd8d2e8 (diff) | |
| download | FreeBSD-src-ab4c20c69dcd70561b35fcc954291a80344aaa79.zip FreeBSD-src-ab4c20c69dcd70561b35fcc954291a80344aaa79.tar.gz | |
Fix the RX free list locking creation and destruction to be consistent
even in the face of errors.
If the RX descriptor list fails, the RX lock won't be initialised, but
then the DMA free path wil try freeing it.
This commit is brought to you by a working mwl(4).
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/mwl/if_mwl.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/dev/mwl/if_mwl.c b/sys/dev/mwl/if_mwl.c index 2a1ede5..79393c8 100644 --- a/sys/dev/mwl/if_mwl.c +++ b/sys/dev/mwl/if_mwl.c @@ -310,6 +310,12 @@ mwl_attach(uint16_t devid, struct mwl_softc *sc) } ic = ifp->if_l2com; + /* + * Setup the RX free list lock early, so it can be consistently + * removed. + */ + MWL_RXFREE_INIT(sc); + /* set these up early for if_printf use */ if_initname(ifp, device_get_name(sc->sc_dev), device_get_unit(sc->sc_dev)); @@ -531,6 +537,7 @@ bad2: bad1: mwl_hal_detach(mh); bad: + MWL_RXFREE_DESTROY(sc); if_free(ifp); sc->sc_invalid = 1; return error; @@ -561,6 +568,7 @@ mwl_detach(struct mwl_softc *sc) ieee80211_ifdetach(ic); callout_drain(&sc->sc_watchdog); mwl_dma_cleanup(sc); + MWL_RXFREE_DESTROY(sc); mwl_tx_cleanup(sc); mwl_hal_detach(sc->sc_mh); if_free(ifp); @@ -2274,7 +2282,6 @@ mwl_rxdma_setup(struct mwl_softc *sc) SLIST_INSERT_HEAD(&sc->sc_rxfree, rbuf, next); sc->sc_nrxfree++; } - MWL_RXFREE_INIT(sc); return 0; } #undef DS2PHYS @@ -2298,7 +2305,6 @@ mwl_rxdma_cleanup(struct mwl_softc *sc) } if (sc->sc_rxdma.dd_desc_len != 0) mwl_desc_cleanup(sc, &sc->sc_rxdma); - MWL_RXFREE_DESTROY(sc); } static int |
