Merge remote-tracking branch 'net-next/master' into mac80211-next

Merging to get the mac80211 updates that have since propagated
into net-next.

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

diff --cc net/mac80211/debugfs_sta.c
index c190c29fe0dde5780e2941059bedebccb146ed92,c80b1e163ea4e6e7405af33acbc02b4fa2c1343c..266d63819415ea78d78c2059edc2fb59787dcb40
--- 1/net/mac80211/debugfs_sta.c
--- 2/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
@@@ -989,11 -1025,17 +1025,15 @@@ void ieee80211_sta_debugfs_add(struct s
        DEBUGFS_ADD_COUNTER(rx_fragments, rx_stats.fragments);
        DEBUGFS_ADD_COUNTER(tx_filtered, status_stats.filtered);
  
 -      if (local->ops->wake_tx_queue)
 +      if (local->ops->wake_tx_queue) {
                DEBUGFS_ADD(aqm);
 -
 -      if (wiphy_ext_feature_isset(local->hw.wiphy,
 -                                  NL80211_EXT_FEATURE_AIRTIME_FAIRNESS))
                DEBUGFS_ADD(airtime);
 +      }
  
+       if (wiphy_ext_feature_isset(local->hw.wiphy,
+                                   NL80211_EXT_FEATURE_AQL))
+               DEBUGFS_ADD(aql);
+ 
        debugfs_create_xul("driver_buffered_tids", 0400, sta->debugfs_dir,
                           &sta->driver_buffered_tids);
  

diff --cc net/mac80211/tx.c
index b31b5078f6562de19f4e7c4f57f4430a92cb0526,a8a7306a1f56c01bfaad49c412bc20222d642c61..c56d801e708f21d9d1068a9b373cdeed297b9660
--- 1/net/mac80211/tx.c
--- 2/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@@ -3670,10 -3675,9 +3679,10 @@@ begin
                break;
        }
  
 +encap_out:
        IEEE80211_SKB_CB(skb)->control.vif = vif;
  
-       if (local->airtime_flags & AIRTIME_USE_AQL) {
+       if (wiphy_ext_feature_isset(local->hw.wiphy, NL80211_EXT_FEATURE_AQL)) {
                u32 airtime;
  
                airtime = ieee80211_calc_expected_tx_airtime(hw, vif, txq->sta,