From 62b40ba81738b4d0729b07ada7db8eb5dbd97f74 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Sun, 1 Jun 2014 20:46:39 +0200 Subject: [PATCH] kernel/iwn: Fix panic on kldunload --- sys/dev/netif/iwn/if_iwn.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/sys/dev/netif/iwn/if_iwn.c b/sys/dev/netif/iwn/if_iwn.c index d5266a0e36..7c7fdfb81a 100644 --- a/sys/dev/netif/iwn/if_iwn.c +++ b/sys/dev/netif/iwn/if_iwn.c @@ -338,7 +338,6 @@ static void iwn_radio_off_task(void *, int); static void iwn_init_locked(struct iwn_softc *); static void iwn_init(void *); static void iwn_stop_locked(struct iwn_softc *); -static void iwn_stop(struct iwn_softc *); static void iwn_scan_start(struct ieee80211com *); static void iwn_scan_end(struct ieee80211com *); static void iwn_set_channel(struct ieee80211com *); @@ -1365,7 +1364,7 @@ iwn_pci_detach(device_t dev) ieee80211_draintask(ic, &sc->sc_radioon_task); ieee80211_draintask(ic, &sc->sc_radiooff_task); - iwn_stop(sc); + iwn_stop_locked(sc); callout_stop(&sc->watchdog_to); callout_stop(&sc->calib_to); ieee80211_ifdetach(ic); @@ -8334,14 +8333,6 @@ iwn_stop_locked(struct iwn_softc *sc) iwn_hw_stop(sc); } -static void -iwn_stop(struct iwn_softc *sc) -{ - wlan_serialize_enter(); - iwn_stop_locked(sc); - wlan_serialize_exit(); -} - /* * Callback from net80211 to start a scan. */ -- 2.41.0