From 0593c99d629e6966b0dc848b469f7730a6d35350 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 10 Feb 2009 21:25:42 +0100 Subject: [PATCH] --- yaml --- r: 134483 b: refs/heads/master c: 14b80724367dfdc86f4807461dd1f7f2dd630416 h: refs/heads/master i: 134481: 26f860439289f2685f82e9ec13996ff2e8868546 134479: 23031335197983bc4a0d6dc502438e093f4c15d2 v: v3 --- [refs] | 2 +- trunk/net/mac80211/scan.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c755dbb5bc42..d41c0420b383 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60b22511921fe79b2a94a27c09cadfd32fcef5d5 +refs/heads/master: 14b80724367dfdc86f4807461dd1f7f2dd630416 diff --git a/trunk/net/mac80211/scan.c b/trunk/net/mac80211/scan.c index 50719ea08172..eddca4e1e13c 100644 --- a/trunk/net/mac80211/scan.c +++ b/trunk/net/mac80211/scan.c @@ -500,7 +500,12 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw) } 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 ieee80211_sub_if_data *scan_sdata, 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) {