mac80211: fix beacon enable more

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>

1 files changed, 12 insertions, 2 deletions

diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 50719ea0817..eddca4e1e13 100644
--- a/net/mac80211/scan.c
+++ b/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) {