Hopefully the last required fix ... disable beaconing
only on beaconing interfaces, and thus avoid calling
ieee80211_if_config for purely virtual interfaces
(those driver doesn't know about).
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
---
net/mac80211/scan.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
--- wireless-testing.orig/net/mac80211/scan.c 2009-02-10 20:59:27.000000000 +0100
+++ wireless-testing/net/mac80211/scan.c 2009-02-10 20:59:30.000000000 +0100
@@ -500,7 +500,12 @@ void ieee80211_scan_completed(struct iee
} else
netif_tx_wake_all_queues(sdata->dev);
- ieee80211_if_config(sdata, IEEE80211_IFCC_BEACON_ENABLED);
+ /* re-enable beaconing */
+ if (sdata->vif.type == NL80211_IFTYPE_AP ||
+ sdata->vif.type == NL80211_IFTYPE_ADHOC ||
+ sdata->vif.type == NL80211_IFTYPE_MESH_POINT)
+ ieee80211_if_config(sdata,
+ IEEE80211_IFCC_BEACON_ENABLED);
}
mutex_unlock(&local->iflist_mtx);
@@ -656,7 +661,12 @@ int ieee80211_start_scan(struct ieee8021
if (!netif_running(sdata->dev))
continue;
- ieee80211_if_config(sdata, IEEE80211_IFCC_BEACON_ENABLED);
+ /* disable beaconing */
+ if (sdata->vif.type == NL80211_IFTYPE_AP ||
+ sdata->vif.type == NL80211_IFTYPE_ADHOC ||
+ sdata->vif.type == NL80211_IFTYPE_MESH_POINT)
+ ieee80211_if_config(sdata,
+ IEEE80211_IFCC_BEACON_ENABLED);
if (sdata->vif.type == NL80211_IFTYPE_STATION) {
if (sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED) {
--
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
