summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-01-26 21:11:57 +0300
committerJohn W. Linville <linville@tuxdriver.com>2009-01-30 00:01:50 +0300
commitfb9ddbf086591ab4c90c44d10468f84d465b3fdf (patch)
tree6663ce9105a08c7368a17408e377841e4400adf1 /net
parentd81c2d9c909e95ee8a5745da95bbb35f8ded3d17 (diff)
downloadlinux-fb9ddbf086591ab4c90c44d10468f84d465b3fdf.tar.xz
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>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/scan.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 8248d7b6ae82..282e6a0dec01 100644
--- 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) {