3 files changed, 11 insertions, 7 deletions

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 8b6daf0219f4..8c9f1c722cdb 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -964,5 +964,6 @@ void ieee80211_recalc_idle(struct ieee80211_local *local)
         mutex_lock(&local->iflist_mtx);
         chg = __ieee80211_recalc_idle(local);
         mutex_unlock(&local->iflist_mtx);
-        ieee80211_hw_config(local, chg);
+        if (chg)
+                ieee80211_hw_config(local, chg);
 }
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index b80bc80e46cf..76df5eabf268 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -154,15 +154,17 @@ static void ieee80211_master_set_multicast_list(struct net_device *dev)
 
 int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
 {
-        struct ieee80211_channel *chan;
+        struct ieee80211_channel *chan, *scan_chan;
         int ret = 0;
         int power;
         enum nl80211_channel_type channel_type;
 
         might_sleep();
 
-        if (local->sw_scanning) {
-                chan = local->scan_channel;
+        scan_chan = local->scan_channel;
+
+        if (scan_chan) {
+                chan = scan_chan;
                 channel_type = NL80211_CHAN_NO_HT;
         } else {
                 chan = local->oper_channel;
@@ -176,7 +178,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
                 changed |= IEEE80211_CONF_CHANGE_CHANNEL;
         }
 
-        if (local->sw_scanning)
+        if (scan_chan)
                 power = chan->max_power;
         else
                 power = local->power_constr_level ?
@@ -859,8 +861,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
                 if (!local->oper_channel) {
                         /* init channel we're on */
                         local->hw.conf.channel =
-                        local->oper_channel =
-                        local->scan_channel = &sband->channels[0];
+                        local->oper_channel = &sband->channels[0];
+                        local->hw.conf.channel_type = NL80211_CHAN_NO_HT;
                 }
                 channels += sband->n_channels;
 
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index c99ef8d04d3d..e51b99b1473c 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -298,6 +298,7 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted)
         was_hw_scan = local->hw_scanning;
         local->hw_scanning = false;
         local->sw_scanning = false;
+        local->scan_channel = NULL;
 
         /* we only have to protect scan_req and hw/sw scan */
         mutex_unlock(&local->scan_mtx);