cfg80211/mac80211 patches from our internal tree 2019-05-29
Subsystems (5)
cover cfg80211/mac80211 patches from our internal tree 2019-05-29
From: Luca Coelho <[email protected]>
Hi,
Some patches with mac80211 and cfg80211 changes from our internal tree.
Please review, though you have already reviewed most if not all of them ;)
Cheers,
Luca.
Avraham Stern (1):
cfg80211: report measurement start TSF correctly
Ilan Peer (2):
cfg80211: Add a function to iterate all BSS entries
ieee80211: Add a missing extended capability flag definition
Johannes Berg (4):
mac80211: call rate_control_send_low() internally
mac80211: use STA info in rate_control_send_low()
mac80211: fill low rate even for HAS_RATE_CONTROL
mac80211: extend __rate_control_send_low warning
Luca Coelho (1):
cfg80211: use BIT_ULL in cfg80211_parse_mbssid_data()
Mordechay Goodstein (1):
cfg80211: util: fix bit count off by one
Naftali Goldstein (1):
mac80211: do not start any work during reconfigure flow
drivers/net/wireless/intel/iwlegacy/3945-rs.c | 3 -- drivers/net/wireless/intel/iwlegacy/4965-rs.c | 4 -- drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 26 ++++------- drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 4 -- drivers/net/wireless/realtek/rtlwifi/rc.c | 3 -- include/linux/ieee80211.h | 7 +++ include/net/cfg80211.h | 20 +++++++++ include/net/mac80211.h | 23 ---------- net/mac80211/cfg.c | 4 +- net/mac80211/ieee80211_i.h | 7 +++ net/mac80211/mlme.c | 7 ++- net/mac80211/rate.c | 28 ++++++------ net/mac80211/rc80211_minstrel.c | 5 +-- net/mac80211/rc80211_minstrel_ht.c | 4 +- net/mac80211/sta_info.c | 43 ++++++++++++++++++- net/mac80211/util.c | 4 ++ net/wireless/pmsr.c | 4 +- net/wireless/scan.c | 25 ++++++++++- net/wireless/util.c | 2 +- 19 files changed, 141 insertions(+), 82 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/10 cfg80211: report measurement start TSF correctly
From: Avraham Stern <[email protected]>
Instead of reporting the AP's TSF, host time was reported. Fix it.
--- net/wireless/pmsr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/wireless/pmsr.c +2 -2
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 */ /* -* Copyright (C) 2018 Intel Corporation +* Copyright (C) 2018 - 2019 Intel Corporation */ #ifndef __PMSR_H#define __PMSR_H
@@ -448,7 +448,7 @@ static int nl80211_pmsr_send_result(struct sk_buff *msg,if (res->ap_tsf_valid &&nla_put_u64_64bit (msg,NL80211_PMSR_RESP_ATTR_AP_TSF , - res->host_time,NL80211_PMSR_RESP_ATTR_PAD )) + res->ap_tsf,NL80211_PMSR_RESP_ATTR_PAD )) goto error;if (res->final &&nla_put_flag (msg,NL80211_PMSR_RESP_ATTR_FINAL ))
Signature · 1 line
2.20.1
PATCH 2/10 cfg80211: use BIT_ULL in cfg80211_parse_mbssid_data()
In reply to Luca CoelhoFrom: Luca Coelho <[email protected]>
The seen_indices variable is u64 and in other parts of the code we assume mbssid_index_ie[2] can be up to 45, so we should use the 64-bit versions of BIT, namely, BIT_ULL().
--- net/wireless/scan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/wireless/scan.c +2 -2
@@ -1602,12 +1602,12 @@ static void cfg80211_parse_mbssid_data(struct wiphy *wiphy,continue ; } -if (seen_indices &BIT (mbssid_index_ie[2 ])) +if (seen_indices &BIT_ULL (mbssid_index_ie[2 ]))/* We don't support legacy split of a profile */ net_dbg_ratelimited ("Partial info for BSSID index %d\n" , mbssid_index_ie[2 ]); - seen_indices |=BIT (mbssid_index_ie[2 ]); + seen_indices |=BIT_ULL (mbssid_index_ie[2 ]); non_tx_data->bssid_index = mbssid_index_ie[2 ]; non_tx_data->max_bssid_indicator = elem->data[0 ];
Signature · 1 line
2.20.1
Re: [PATCH 02/10] cfg80211: use BIT_ULL in cfg80211_parse_mbssid_data()
Quoted 7 lines · Luca Coelho
From: Luca Coelho <[email protected]>
The
seen_indicesvariable is u64 and in other parts of the code we assume mbssid_index_ie[2] can be up to 45, so we should use the 64-bit versions of BIT, namely,BIT_ULL().Reported-by Dan Carpented <[email protected]>
s/ted/ter/ :)
Signature · 1 line
Kalle Valo
PATCH 3/10 mac80211: do not start any work during reconfigure flow
In reply to Luca CoelhoFrom: Naftali Goldstein <[email protected]>
It is not a good idea to try to perform any work (e.g. send an auth frame) during reconfigure flow.
Prevent this from happening, and at the end of the reconfigure flow requeue all the works.
--- net/mac80211/ieee80211_i.h | 7 +++++++ net/mac80211/util.c | 4 ++++ 2 files changed, 11 insertions(+)
net/mac80211/ieee80211_i.h +7 -0
@@ -2037,6 +2037,13 @@ void __ieee80211_flush_queues(struct ieee80211_local *local,static inline bool ieee80211_can_run_worker (struct ieee80211_local *local) { +/* +* It's unsafe to try to do any work during reconfigure flow. +* When the flow ends the work will be requeued. +*/ +if (local->in_reconfig) +return false; +/* * If quiescing is set, we are racing with __ieee80211_suspend. * __ieee80211_suspend flushes the workers after setting quiescing,
net/mac80211/util.c +4 -0
@@ -2480,6 +2480,10 @@ int ieee80211_reconfig(struct ieee80211_local *local)mutex_lock (&local->mtx);ieee80211_start_next_roc (local);mutex_unlock (&local->mtx); + +/* Requeue all works */ +list_for_each_entry (sdata, &local->interfaces, list) +ieee80211_queue_work (&local->hw, &sdata->work); } ieee80211_wake_queues_by_reason(hw, IEEE80211_MAX_QUEUE_MAP,
Signature · 1 line
2.20.1
PATCH 4/10 cfg80211: util: fix bit count off by one
In reply to Luca CoelhoFrom: Mordechay Goodstein <[email protected]>
The bits of Rx MCS Map in VHT capability were enumerated with index transform - index i -> (i + 1) bit => nss i. BUG!
while it should be - index i -> (i + 1) bit => (i + 1) nss.
The bug was exposed in commit a53b2a0b1245 ("iwlwifi: mvm: implement VHT extended NSS support in rs.c"), where iwlwifi started using the function.
--- net/wireless/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/wireless/util.c +1 -1
@@ -1998,7 +1998,7 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap,continue ;if (supp >= mcs_encoding) { - max_vht_nss = i; + max_vht_nss = i +1 ;break ; } }
Signature · 1 line
2.20.1
PATCH 5/10 cfg80211: Add a function to iterate all BSS entries
In reply to Luca CoelhoFrom: Ilan Peer <[email protected]>
Add a function that iterates over the BSS entries associated with a given wiphy and calls a callback for each iterated BSS. This can be used by drivers in various ways, e.g., to evaluate some property for all the BSSs in the medium.
--- include/net/cfg80211.h | 20 ++++++++++++++++++++ net/wireless/scan.c | 21 +++++++++++++++++++++ 2 files changed, 41 insertions(+)
include/net/cfg80211.h +20 -0
@@ -5721,6 +5721,26 @@ void cfg80211_put_bss(struct wiphy *wiphy, struct cfg80211_bss *bss);*/ void cfg80211_unlink_bss (struct wiphy *wiphy,struct cfg80211_bss *bss); +/** +* cfg80211_bss_iter - iterate all BSS entries +* +* This function iterates over the BSS entries associated with the given wiphy +* and calls the callback for the iterated BSS. The iterator function is not +* allowed to call functions that might modify the internal state of the BSS DB. +* +* @wiphy: the wiphy +* @chandef: if given, the iterator function will be called only if the channel +* of the currently iterated BSS is a subset of the given channel. +* @iter: the iterator function to call +* @iter_data: an argument to the iterator function +*/ +void cfg80211_bss_iter (struct wiphy *wiphy, +struct cfg80211_chan_def *chandef, +void (*iter)(struct wiphy *wiphy, +struct cfg80211_bss *bss, +void *data), +void *iter_data); +static inline enum nl80211_bss_scan_width cfg80211_chandef_to_scan_width (const struct cfg80211_chan_def *chandef) {
net/wireless/scan.c +21 -0
@@ -1974,6 +1974,27 @@ void cfg80211_unlink_bss(struct wiphy *wiphy, struct cfg80211_bss *pub) }EXPORT_SYMBOL (cfg80211_unlink_bss); +void cfg80211_bss_iter (struct wiphy *wiphy, +struct cfg80211_chan_def *chandef, +void (*iter)(struct wiphy *wiphy, +struct cfg80211_bss *bss, +void *data), +void *iter_data) +{ +struct cfg80211_registered_device *rdev =wiphy_to_rdev (wiphy); +struct cfg80211_internal_bss *bss; + +spin_lock_bh (&rdev->bss_lock); + +list_for_each_entry (bss, &rdev->bss_list, list) { +if (!chandef ||cfg80211_is_sub_chan (chandef, bss->pub.channel)) +iter (wiphy, &bss->pub, iter_data); + } + +spin_unlock_bh (&rdev->bss_lock); +} +EXPORT_SYMBOL (cfg80211_bss_iter); +#ifdef CONFIG_CFG80211_WEXT static struct cfg80211_registered_device *cfg80211_get_dev_from_ifindex (struct net *net,int ifindex)
Signature · 1 line
2.20.1
PATCH 6/10 ieee80211: Add a missing extended capability flag definition
In reply to Luca CoelhoFrom: Ilan Peer <[email protected]>
Add the "OBSS Narrow Bandwidth RU In OFDMA Tolerance Support" flag definition to the definitions of the flags covered by the Extended Capability IE.
--- include/linux/ieee80211.h | 7 +++++++ 1 file changed, 7 insertions(+)
include/linux/ieee80211.h +7 -0
@@ -2712,6 +2712,13 @@ enum ieee80211_tdls_actioncode {#define WLAN_EXT_CAPA10_TWT_REQUESTER_SUPPORT BIT(5)#define WLAN_EXT_CAPA10_TWT_RESPONDER_SUPPORT BIT(6) +/* +* When set, indicates that the AP is able to tolerate 26-tone RU UL +* OFDMA transmissions using HE TB PPDU from OBSS (not falsely classify the +* 26-tone RU UL OFDMA transmissions as radar pulses). +*/ +#define WLAN_EXT_CAPA10_OBSS_NARROW_BW_RU_TOLERANCE_SUPPORT BIT(7) +/* Defines support for enhanced multi-bssid advertisement*/ #define WLAN_EXT_CAPA11_EMA_SUPPORT BIT(1)
Signature · 1 line
2.20.1
PATCH 7/10 mac80211: call rate_control_send_low() internally
In reply to Luca CoelhoFrom: Johannes Berg <[email protected]>
There's no rate control algorithm that *doesn't* want to call it internally, and calling it internally will let us modify its behaviour in the future.
--- drivers/net/wireless/intel/iwlegacy/3945-rs.c | 3 --- drivers/net/wireless/intel/iwlegacy/4965-rs.c | 4 --- drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 26 +++++++------------ drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 4 --- drivers/net/wireless/realtek/rtlwifi/rc.c | 3 --- include/net/mac80211.h | 23 ---------------- net/mac80211/rate.c | 14 +++++----- net/mac80211/rc80211_minstrel.c | 5 +--- net/mac80211/rc80211_minstrel_ht.c | 4 +-- 9 files changed, 19 insertions(+), 67 deletions(-)
drivers/net/wireless/intel/iwlegacy/3945-rs.c +0 -3
@@ -646,9 +646,6 @@ il3945_rs_get_rate(void *il_r, struct ieee80211_sta *sta, void *il_sta, il_sta =NULL ; } -if (rate_control_send_low (sta, il_sta, txrc)) -return ; - rate_mask = sta->supp_rates[sband->band];/* get user max rate if set */
drivers/net/wireless/intel/iwlegacy/4965-rs.c +0 -4
@@ -2224,10 +2224,6 @@ il4965_rs_get_rate(void *il_r, struct ieee80211_sta *sta, void *il_sta, il_sta =NULL ; } -/* Send management frames and NO_ACK data using lowest rate. */ -if (rate_control_send_low (sta, il_sta, txrc)) -return ; -if (!lq_sta)return ;
drivers/net/wireless/intel/iwlwifi/dvm/rs.c +9 -17
@@ -1,6 +1,7 @@/****************************************************************************** * * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved. +* Copyright (C) 2019 Intel Corporation * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as
@@ -2715,25 +2716,17 @@ static void rs_get_rate(void *priv_r, struct ieee80211_sta *sta, void *priv_sta,IWL_DEBUG_RATE_LIMIT (priv,"rate scale calculate new rate for skb\n" );/* Get max rate if user set max rate */ -if (lq_sta) { - lq_sta->max_rate_idx =fls (txrc->rate_idx_mask) -1 ; -if ((sband->band ==NL80211_BAND_5GHZ ) && - (lq_sta->max_rate_idx !=-1 )) - lq_sta->max_rate_idx +=IWL_FIRST_OFDM_RATE ; -if ((lq_sta->max_rate_idx <0 ) || - (lq_sta->max_rate_idx >=IWL_RATE_COUNT )) - lq_sta->max_rate_idx =-1 ; - } + lq_sta->max_rate_idx =fls (txrc->rate_idx_mask) -1 ; +if (sband->band ==NL80211_BAND_5GHZ && lq_sta->max_rate_idx !=-1 ) + lq_sta->max_rate_idx +=IWL_FIRST_OFDM_RATE ; +if (lq_sta->max_rate_idx <0 || lq_sta->max_rate_idx >=IWL_RATE_COUNT ) + lq_sta->max_rate_idx =-1 ; -/* Treat uninitialized rate scaling data same as non-existing. */ -if (lq_sta && !lq_sta->drv) { +if (!lq_sta->drv) {IWL_DEBUG_RATE (priv,"Rate scaling not initialized yet.\n" ); - priv_sta =NULL ; - } - -/* Send management frames and NO_ACK data using lowest rate. */ -if (rate_control_send_low (sta, priv_sta, txrc)) +/* mac80211 already set up the data for using low rates */ return ; + } rate_idx = lq_sta->last_txrate_idx;
@@ -2802,7 +2795,6 @@ void iwl_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta, u8 sta_i lq_sta = &sta_priv->lq_sta; sband = hw->wiphy->bands[conf->chandef.chan->band]; - lq_sta->lq.sta_id = sta_id;for (j =0 ; j <LQ_SIZE ; j++)
drivers/net/wireless/intel/iwlwifi/mvm/rs.c +0 -4
@@ -2960,10 +2960,6 @@ static void rs_drv_get_rate(void *mvm_r, struct ieee80211_sta *sta, mvm_sta =NULL ; } -/* Send management frames and NO_ACK data using lowest rate. */ -if (rate_control_send_low (sta, mvm_sta, txrc)) -return ; -if (!mvm_sta)return ;
drivers/net/wireless/realtek/rtlwifi/rc.c +0 -3
@@ -173,9 +173,6 @@ static void rtl_get_rate(void *ppriv, struct ieee80211_sta *sta,u8 try_per_rate, i, rix;bool not_data = !ieee80211_is_data (fc); -if (rate_control_send_low (sta, priv_sta, txrc)) -return ; - rix =_rtl_rc_get_highest_rix (rtlpriv, sta, skb, not_data); try_per_rate =1 ; _rtl_rc_rate_set_series(rtlpriv, sta, &rates[0], txrc,
include/net/mac80211.h +0 -23
@@ -5951,29 +5951,6 @@ static inline int rate_supported(struct ieee80211_sta *sta,return (sta ==NULL || sta->supp_rates[band] &BIT (index)); } -/** -* rate_control_send_low - helper for drivers for management/no-ack frames -* -* Rate control algorithms that agree to use the lowest rate to -* send management frames and NO_ACK data with the respective hw -* retries should use this in the beginning of their mac80211 get_rate -* callback. If true is returned the rate control can simply return. -* If false is returned we guarantee that sta and sta and priv_sta is -* not null. -* -* Rate control algorithms wishing to do more intelligent selection of -* rate for multicast/broadcast frames may choose to not use this. -* -* @sta: &struct ieee80211_sta pointer to the target destination. Note -* that this may be null. -* @priv_sta: private rate control structure. This may be null. -* @txrc: rate control information we sholud populate for mac80211. -*/ -bool rate_control_send_low (struct ieee80211_sta *sta, -void *priv_sta, -struct ieee80211_tx_rate_control *txrc); - -static inline s8 rate_lowest_index (struct ieee80211_supported_band *sband,struct ieee80211_sta *sta)
net/mac80211/rate.c +8 -6
@@ -3,6 +3,7 @@* Copyright 2005-2006, Devicescape Software, Inc. * Copyright (c) 2006 Jiri Benc <[email protected]> * Copyright 2017 Intel Deutschland GmbH +* Copyright (C) 2019 Intel Corporation * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as
@@ -369,9 +370,8 @@ static void __rate_control_send_low(struct ieee80211_hw *hw, } -bool rate_control_send_low (struct ieee80211_sta *pubsta, -void *priv_sta, -struct ieee80211_tx_rate_control *txrc) +static bool rate_control_send_low (struct ieee80211_sta *pubsta, +struct ieee80211_tx_rate_control *txrc) {struct ieee80211_tx_info *info =IEEE80211_SKB_CB (txrc->skb);struct ieee80211_supported_band *sband = txrc->sband;
@@ -379,7 +379,7 @@ bool rate_control_send_low(struct ieee80211_sta *pubsta,int mcast_rate;bool use_basicrate = false; -if (!pubsta || !priv_sta ||rc_no_data_or_no_ack_use_min (txrc)) { +if (!pubsta ||rc_no_data_or_no_ack_use_min (txrc)) {__rate_control_send_low (txrc->hw, sband, pubsta, info, txrc->rate_idx_mask);
@@ -405,7 +405,6 @@ bool rate_control_send_low(struct ieee80211_sta *pubsta, }return false; } -EXPORT_SYMBOL (rate_control_send_low);static bool rate_idx_match_legacy_mask (s8 *rate_idx,int n_bitrates,u32 mask) {
@@ -902,12 +901,15 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,if (ieee80211_hw_check (&sdata->local->hw,HAS_RATE_CONTROL ))return ; +if (rate_control_send_low (ista, txrc)) +return ; +if (ista) {spin_lock_bh (&sta->rate_ctrl_lock); ref->ops->get_rate (ref->priv, ista, priv_sta, txrc);spin_unlock_bh (&sta->rate_ctrl_lock); }else { - ref->ops->get_rate (ref->priv,NULL ,NULL , txrc); +rate_control_send_low (NULL , txrc); }if (ieee80211_hw_check (&sdata->local->hw,SUPPORTS_RC_TABLE ))
net/mac80211/rc80211_minstrel.c +1 -4
@@ -1,5 +1,6 @@/* * Copyright (C) 2008 Felix Fietkau <[email protected]> +* Copyright (C) 2019 Intel Corporation * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as
@@ -340,10 +341,6 @@ minstrel_get_rate(void *priv, struct ieee80211_sta *sta,int delta;int sampling_ratio; -/* management/no-ack frames do not use rate control */ -if (rate_control_send_low (sta, priv_sta, txrc)) -return ; -/* check multi-rate-retry capabilities & adjust lookaround_rate */ mrr_capable = mp->has_mrr && !txrc->rts &&
net/mac80211/rc80211_minstrel_ht.c +1 -3
@@ -1,5 +1,6 @@/* * Copyright (C) 2010-2013 Felix Fietkau <[email protected]> +* Copyright (C) 2019 Intel Corporation * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as
@@ -1098,9 +1099,6 @@ minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,struct minstrel_priv *mp = priv;int sample_idx; -if (rate_control_send_low (sta, priv_sta, txrc)) -return ; -if (!msp->is_ht)return mac80211_minstrel.get_rate (priv, sta, &msp->legacy, txrc);
Signature · 1 line
2.20.1
PATCH 8/10 mac80211: use STA info in rate_control_send_low()
In reply to Luca CoelhoFrom: Johannes Berg <[email protected]>
Even if we have a station, we currently call rate_control_send_low() with the NULL station unless further rate control (driver, minstrel) has been initialized.
Change this so we can use more information about the station to use a better rate. For example, when we associate with an AP, we will now use the lowest rate it advertised as supported (that we can) rather than the lowest mandatory rate. This aligns our behaviour with most other 802.11 implementations.
To make this possible, we need to also ensure that we have non-zero rates at all times, so in case we really have *nothing* pre-fill the supp_rates bitmap with the very lowest mandatory bitmap (11b and 11a on 2.4 and 5 GHz respectively).
Additionally, hostapd appears to be giving us an empty supported rates bitmap (it can and should do better, since the STA must have supported for at least the basic rates in the BSS), so ignore any such bitmaps that would actually zero out the supp_rates, and in that case just keep the pre-filled mandatory rates.
--- net/mac80211/cfg.c | 4 ++-- net/mac80211/mlme.c | 7 ++++++- net/mac80211/rate.c | 12 ++++++------ net/mac80211/sta_info.c | 43 ++++++++++++++++++++++++++++++++++++++++- 4 files changed, 56 insertions(+), 10 deletions(-)
net/mac80211/cfg.c +2 -2
@@ -4,7 +4,7 @@* Copyright 2006-2010 Johannes Berg <[email protected]> * Copyright 2013-2015 Intel Mobile Communications GmbH * Copyright (C) 2015-2017 Intel Deutschland GmbH -* Copyright (C) 2018 Intel Corporation +* Copyright (C) 2018-2019 Intel Corporation * * This file is GPLv2 as found in COPYING. */
@@ -1466,7 +1466,7 @@ static int sta_apply_parameters(struct ieee80211_local *local,return ret; } -if (params->supported_rates) { +if (params->supported_rates && params->supported_rates_len) { ieee80211_parse_bitrates(&sdata->vif.bss_conf.chandef, sband, params->supported_rates, params->supported_rates_len,
net/mac80211/mlme.c +6 -1
@@ -4941,7 +4941,12 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata, basic_rates =BIT (min_rate_index); } - new_sta->sta.supp_rates[cbss->channel->band] = rates; +if (rates) + new_sta->sta.supp_rates[cbss->channel->band] = rates; +else +sdata_info (sdata, +"No rates found, keeping mandatory only\n" ); + sdata->vif.bss_conf.basic_rates = basic_rates;/* cf. IEEE 802.11 9.2.12 */
net/mac80211/rate.c +6 -6
@@ -887,11 +887,6 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,struct ieee80211_tx_info *info =IEEE80211_SKB_CB (txrc->skb);int i; -if (sta &&test_sta_flag (sta,WLAN_STA_RATE_CONTROL )) { - ista = &sta->sta; - priv_sta = sta->rate_ctrl_priv; - } -for (i =0 ; i <IEEE80211_TX_MAX_RATES ; i++) { info->control.rates[i].idx =-1 ; info->control.rates[i].flags =0 ;
@@ -901,9 +896,14 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,if (ieee80211_hw_check (&sdata->local->hw,HAS_RATE_CONTROL ))return ; -if (rate_control_send_low (ista, txrc)) +if (rate_control_send_low (sta ? &sta->sta :NULL , txrc))return ; +if (sta &&test_sta_flag (sta,WLAN_STA_RATE_CONTROL )) { + ista = &sta->sta; + priv_sta = sta->rate_ctrl_priv; + } +if (ista) {spin_lock_bh (&sta->rate_ctrl_lock); ref->ops->get_rate (ref->priv, ista, priv_sta, txrc);
net/mac80211/sta_info.c +42 -1
55 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 9/10 mac80211: fill low rate even for HAS_RATE_CONTROL
In reply to Luca CoelhoFrom: Johannes Berg <[email protected]>
If HW advertises it has rate control, we skip all of the rate control assignments, but sometimes the data we have here is useful, especially so that we don't have to do the lookups again on which rates are configured and are supported.
So do the low rate assignment anyway to help out drivers that might need it.
--- net/mac80211/rate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/mac80211/rate.c +2 -2
@@ -893,10 +893,10 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata, info->control.rates[i].count =0 ; } -if (ieee80211_hw_check (&sdata->local->hw,HAS_RATE_CONTROL )) +if (rate_control_send_low (sta ? &sta->sta :NULL , txrc))return ; -if (rate_control_send_low (sta ? &sta->sta :NULL , txrc)) +if (ieee80211_hw_check (&sdata->local->hw,HAS_RATE_CONTROL ))return ;if (sta &&test_sta_flag (sta,WLAN_STA_RATE_CONTROL )) {
Signature · 1 line
2.20.1
PATCH 10/10 mac80211: extend __rate_control_send_low warning
In reply to Luca CoelhoFrom: Johannes Berg <[email protected]>
This appears to happen occasionally, and if it does we really want even more information than we have now.
--- net/mac80211/rate.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/mac80211/rate.c +3 -1
@@ -358,8 +358,10 @@ static void __rate_control_send_low(struct ieee80211_hw *hw,break ; }WARN_ONCE (i == sband->n_bitrates, -"no supported rates (0x%x) in rate_mask 0x%x with flags 0x%x\n" , +"no supported rates for sta %pM (0x%x, band %d) in rate_mask 0x%x with flags 0x%x\n" , + sta ? sta->addr :NULL , sta ? sta->supp_rates[sband->band] :-1 , + sband->band, rate_mask, rate_flags); info->control.rates[0].count =
Signature · 1 line
2.20.1