Merge remote-tracking branch 'wireless-next/master' into HEAD

Merge to get the wil6210 changes that a cfg80211 change needs.
A conflict in drivers/net/wireless/ath/ath9k/init.c was just
whitespace changes.

Also fix a semantic conflict due to cw1200 using WoWLAN which
I had modified in my tree.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 10 insertions, 7 deletions

diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index f993362e9e13..f359b0d7078d 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -21,6 +21,7 @@
 #include <linux/ath9k_platform.h>
 #include <linux/module.h>
 #include <linux/relay.h>
+#include <net/ieee80211_radiotap.h>
 
 #include "ath9k.h"
 
@@ -613,9 +614,6 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
         spin_lock_init(&sc->sc_serial_rw);
         spin_lock_init(&sc->sc_pm_lock);
         mutex_init(&sc->mutex);
-#ifdef CONFIG_ATH9K_MAC_DEBUG
-        spin_lock_init(&sc->debug.samp_lock);
-#endif
         tasklet_init(&sc->intr_tq, ath9k_tasklet, (unsigned long)sc);
         tasklet_init(&sc->bcon_tasklet, ath9k_beacon_tasklet,
                      (unsigned long)sc);
@@ -778,12 +776,19 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
                 IEEE80211_HW_REPORTS_TX_ACK_STATUS |
                 IEEE80211_HW_SUPPORTS_RC_TABLE;
 
-        if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT)
-                 hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION;
+        if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) {
+                hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION;
+
+                if (AR_SREV_9280_20_OR_LATER(ah))
+                        hw->radiotap_mcs_details |=
+                                IEEE80211_RADIOTAP_MCS_HAVE_STBC;
+        }
 
         if (AR_SREV_9160_10_OR_LATER(sc->sc_ah) || ath9k_modparam_nohwcrypt)
                 hw->flags |= IEEE80211_HW_MFP_CAPABLE;
 
+        hw->wiphy->features |= NL80211_FEATURE_ACTIVE_MONITOR;
+
         hw->wiphy->interface_modes =
                 BIT(NL80211_IFTYPE_P2P_GO) |
                 BIT(NL80211_IFTYPE_P2P_CLIENT) |
@@ -804,14 +809,12 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
         hw->wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
 
 #ifdef CONFIG_PM_SLEEP
-
         if ((ah->caps.hw_caps & ATH9K_HW_WOW_DEVICE_CAPABLE) &&
             device_can_wakeup(sc->dev))
                 hw->wiphy->wowlan = &ath9k_wowlan_support;
 
         atomic_set(&sc->wow_sleep_proc_intr, -1);
         atomic_set(&sc->wow_got_bmiss_intr, -1);
-
 #endif
 
         hw->queues = 4;