1 files changed, 28 insertions, 11 deletions

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index d999bf3b84e1..e323d4e6647b 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -100,7 +100,7 @@ static void ieee80211_reconfig_filter(struct work_struct *work)
  */
 bool ieee80211_cfg_on_oper_channel(struct ieee80211_local *local)
 {
-        struct ieee80211_channel *chan, *scan_chan;
+        struct ieee80211_channel *chan;
         enum nl80211_channel_type channel_type;
 
         /* This logic needs to match logic in ieee80211_hw_config */
@@ -114,7 +114,7 @@ bool ieee80211_cfg_on_oper_channel(struct ieee80211_local *local)
                 else
                         channel_type = NL80211_CHAN_NO_HT;
         } else if (local->tmp_channel) {
-                chan = scan_chan = local->tmp_channel;
+                chan = local->tmp_channel;
                 channel_type = local->tmp_channel_type;
         } else {
                 chan = local->oper_channel;
@@ -126,8 +126,8 @@ bool ieee80211_cfg_on_oper_channel(struct ieee80211_local *local)
                 return false;
 
         /* Check current hardware-config against oper_channel. */
-        if ((local->oper_channel != local->hw.conf.channel) ||
-            (local->_oper_channel_type != local->hw.conf.channel_type))
+        if (local->oper_channel != local->hw.conf.channel ||
+            local->_oper_channel_type != local->hw.conf.channel_type)
                 return false;
 
         return true;
@@ -135,7 +135,7 @@ bool ieee80211_cfg_on_oper_channel(struct ieee80211_local *local)
 
 int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
 {
-        struct ieee80211_channel *chan, *scan_chan;
+        struct ieee80211_channel *chan;
         int ret = 0;
         int power;
         enum nl80211_channel_type channel_type;
@@ -143,14 +143,12 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
 
         might_sleep();
 
-        scan_chan = local->scan_channel;
-
         /* If this off-channel logic ever changes,  ieee80211_on_oper_channel
          * may need to change as well.
          */
         offchannel_flag = local->hw.conf.flags & IEEE80211_CONF_OFFCHANNEL;
-        if (scan_chan) {
-                chan = scan_chan;
+        if (local->scan_channel) {
+                chan = local->scan_channel;
                 /* If scanning on oper channel, use whatever channel-type
                  * is currently in use.
                  */
@@ -159,7 +157,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
                 else
                         channel_type = NL80211_CHAN_NO_HT;
         } else if (local->tmp_channel) {
-                chan = scan_chan = local->tmp_channel;
+                chan = local->tmp_channel;
                 channel_type = local->tmp_channel_type;
         } else {
                 chan = local->oper_channel;
@@ -595,7 +593,10 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
 
         wiphy->flags |= WIPHY_FLAG_NETNS_OK |
                         WIPHY_FLAG_4ADDR_AP |
-                        WIPHY_FLAG_4ADDR_STATION;
+                        WIPHY_FLAG_4ADDR_STATION |
+                        WIPHY_FLAG_REPORTS_OBSS;
+
+        wiphy->features = NL80211_FEATURE_SK_TX_STATUS;
 
         if (!ops->set_key)
                 wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
@@ -670,6 +671,11 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
         INIT_WORK(&local->sched_scan_stopped_work,
                   ieee80211_sched_scan_stopped_work);
 
+        spin_lock_init(&local->ack_status_lock);
+        idr_init(&local->ack_status_frames);
+        /* preallocate at least one entry */
+        idr_pre_get(&local->ack_status_frames, GFP_KERNEL);
+
         sta_info_init(local);
 
         for (i = 0; i < IEEE80211_MAX_QUEUES; i++) {
@@ -1045,6 +1051,13 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw)
 }
 EXPORT_SYMBOL(ieee80211_unregister_hw);
 
+static int ieee80211_free_ack_frame(int id, void *p, void *data)
+{
+        WARN_ONCE(1, "Have pending ack frames!\n");
+        kfree_skb(p);
+        return 0;
+}
+
 void ieee80211_free_hw(struct ieee80211_hw *hw)
 {
         struct ieee80211_local *local = hw_to_local(hw);
@@ -1055,6 +1068,10 @@ void ieee80211_free_hw(struct ieee80211_hw *hw)
         if (local->wiphy_ciphers_allocated)
                 kfree(local->hw.wiphy->cipher_suites);
 
+        idr_for_each(&local->ack_status_frames,
+                     ieee80211_free_ack_frame, NULL);
+        idr_destroy(&local->ack_status_frames);
+
         wiphy_free(local->hw.wiphy);
 }
 EXPORT_SYMBOL(ieee80211_free_hw);