From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 2 Jan 2020 13:50:09 +0000 (+0100)
Subject: Merge remote-tracking branch 'net-next/master' into mac80211-next
X-Git-Tag: v5.10.7~2946^2~425^2~30
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d6aa9ba4f8228c75970fc4fad27194611a548a6;p=platform%2Fkernel%2Flinux-rpi.git

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>
---

7d6aa9ba4f8228c75970fc4fad27194611a548a6
diff --cc net/mac80211/debugfs_sta.c
index c190c29,c80b1e1..266d638
--- a/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 b31b507,a8a7306a..c56d801
--- a/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,