mac80211: don't try to powersave/config disabled interfaces

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 8248d7b6ae82a4170abb9814e4aaa0c151f5dea9..282e6a0dec01c4b2f558135f4ea9b6e9751cd6a4 100644 (file)
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -475,6 +475,9 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw)
 
        mutex_lock(&local->iflist_mtx);
        list_for_each_entry(sdata, &local->interfaces, list) {
+               if (!netif_running(sdata->dev))
+                       continue;
+
                /* Tell AP we're back */
                if (sdata->vif.type == NL80211_IFTYPE_STATION) {
                        if (sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED) {
@@ -637,6 +640,9 @@ int ieee80211_start_scan(struct ieee80211_sub_if_data *scan_sdata,
 
        mutex_lock(&local->iflist_mtx);
        list_for_each_entry(sdata, &local->interfaces, list) {
+               if (!netif_running(sdata->dev))
+                       continue;
+
                ieee80211_if_config(sdata, IEEE80211_IFCC_BEACON_ENABLED);
 
                if (sdata->vif.type == NL80211_IFTYPE_STATION) {