diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-01-26 13:11:57 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-01-29 16:01:50 -0500 |
commit | fb9ddbf086591ab4c90c44d10468f84d465b3fdf (patch) | |
tree | 6663ce9105a08c7368a17408e377841e4400adf1 /net/mac80211/scan.c | |
parent | d81c2d9c909e95ee8a5745da95bbb35f8ded3d17 (diff) |
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/mac80211/scan.c')
-rw-r--r-- | net/mac80211/scan.c | 6 |
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) | |||
475 | 475 | ||
476 | mutex_lock(&local->iflist_mtx); | 476 | mutex_lock(&local->iflist_mtx); |
477 | list_for_each_entry(sdata, &local->interfaces, list) { | 477 | list_for_each_entry(sdata, &local->interfaces, list) { |
478 | if (!netif_running(sdata->dev)) | ||
479 | continue; | ||
480 | |||
478 | /* Tell AP we're back */ | 481 | /* Tell AP we're back */ |
479 | if (sdata->vif.type == NL80211_IFTYPE_STATION) { | 482 | if (sdata->vif.type == NL80211_IFTYPE_STATION) { |
480 | if (sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED) { | 483 | if (sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED) { |
@@ -637,6 +640,9 @@ int ieee80211_start_scan(struct ieee80211_sub_if_data *scan_sdata, | |||
637 | 640 | ||
638 | mutex_lock(&local->iflist_mtx); | 641 | mutex_lock(&local->iflist_mtx); |
639 | list_for_each_entry(sdata, &local->interfaces, list) { | 642 | list_for_each_entry(sdata, &local->interfaces, list) { |
643 | if (!netif_running(sdata->dev)) | ||
644 | continue; | ||
645 | |||
640 | ieee80211_if_config(sdata, IEEE80211_IFCC_BEACON_ENABLED); | 646 | ieee80211_if_config(sdata, IEEE80211_IFCC_BEACON_ENABLED); |
641 | 647 | ||
642 | if (sdata->vif.type == NL80211_IFTYPE_STATION) { | 648 | if (sdata->vif.type == NL80211_IFTYPE_STATION) { |