lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac80211: fix beacon enable more

Browse Source 
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@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg
2009-02-10 21:25:42 +01:00
committed by John W. Linville
parent 60b2251192
commit 14b8072436
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
net/mac80211/scan.c
View File

@@ -500,7 +500,12 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw)
} else } else
netif_tx_wake_all_queues(sdata->dev); 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); 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)) if (!netif_running(sdata->dev))
continue; 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->vif.type == NL80211_IFTYPE_STATION) {
if (sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED) { if (sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED) {