aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-07-13 07:23:39 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-07-24 15:05:13 -0400
commit0e2b6286805c419d28a4c1e19e3a121af7449b20 (patch)
treedef761584adbf70629938db1590a112e9f7ba6d9 /net/mac80211/mlme.c
parentec96cfd8215af1cda016837efb266409164e3a30 (diff)
mac80211: cancel the connection monitor timers/work
In "mac80211: monitor the connection" I forgot to add code to cancel the new timers & work when the interface is brought down, which isn't a problem if you just bring it down, but _is_ a problem when you destroy the interface. Correct this lapse. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 18dad229344c..e3b3156aca9e 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1163,6 +1163,9 @@ static void ieee80211_mgd_probe_ap(struct ieee80211_sub_if_data *sdata,
1163 const u8 *ssid; 1163 const u8 *ssid;
1164 bool already = false; 1164 bool already = false;
1165 1165
1166 if (!netif_running(sdata->dev))
1167 return;
1168
1166 mutex_lock(&ifmgd->mtx); 1169 mutex_lock(&ifmgd->mtx);
1167 1170
1168 if (!ifmgd->associated) 1171 if (!ifmgd->associated)