diff options
author | Johannes Berg <johannes.berg@intel.com> | 2020-01-02 14:50:09 +0100 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2020-01-02 14:50:58 +0100 |
commit | 7d6aa9ba4f8228c75970fc4fad27194611a548a6 (patch) | |
tree | 4bbd64f6671391d6d93c1a1806ffec005114524e /net/mac80211/tx.c | |
parent | 1ee7826ab68f7e9fa1a01533983acf6a6f62e297 (diff) | |
parent | fe23d63422c83cd7c8154dc7faef6af97be4b948 (diff) | |
download | linux-stable-7d6aa9ba4f8228c75970fc4fad27194611a548a6.tar.gz linux-stable-7d6aa9ba4f8228c75970fc4fad27194611a548a6.tar.bz2 linux-stable-7d6aa9ba4f8228c75970fc4fad27194611a548a6.zip |
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>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r-- | net/mac80211/tx.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index b31b5078f656..c56d801e708f 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -2257,6 +2257,15 @@ netdev_tx_t ieee80211_monitor_start_xmit(struct sk_buff *skb, payload[7]); } + /* + * Initialize skb->priority for QoS frames. This is put in the TID field + * of the frame before passing it to the driver. + */ + if (ieee80211_is_data_qos(hdr->frame_control)) { + u8 *p = ieee80211_get_qos_ctl(hdr); + skb->priority = *p & IEEE80211_QOS_CTL_TAG1D_MASK; + } + memset(info, 0, sizeof(*info)); info->flags = IEEE80211_TX_CTL_REQ_TX_STATUS | @@ -3673,7 +3682,7 @@ begin: 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, @@ -3795,7 +3804,7 @@ bool ieee80211_txq_airtime_check(struct ieee80211_hw *hw, struct sta_info *sta; struct ieee80211_local *local = hw_to_local(hw); - if (!(local->airtime_flags & AIRTIME_USE_AQL)) + if (!wiphy_ext_feature_isset(local->hw.wiphy, NL80211_EXT_FEATURE_AQL)) return true; if (!txq->sta) |