ath9k_hw: fix potential spurious tx error bit interpretation
Subsystems (2)
PATCH 1/3 ath9k_hw: fix potential spurious tx error bit interpretation
According to documentation, AR_ExcessiveRetries, AR_Filtered and AR_FIFOUnderrun are only valid if AR_FrmXmitOK is clear.
Not checking this might result in suboptimal FIFO settings, unnecessary retransmissions, or other connectivity issues.
--- drivers/net/wireless/ath/ath9k/ar9002_mac.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-)
drivers/net/wireless/ath/ath9k/ar9002_mac.c +9 -7
@@ -237,13 +237,15 @@ static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds, status =ACCESS_ONCE (ads->ds_txstatus1);if (status & AR_FrmXmitOK) ts->ts_status |=ATH9K_TX_ACKED ; -if (status & AR_ExcessiveRetries) - ts->ts_status |=ATH9K_TXERR_XRETRY ; -if (status & AR_Filtered) - ts->ts_status |=ATH9K_TXERR_FILT ; -if (status & AR_FIFOUnderrun) { - ts->ts_status |=ATH9K_TXERR_FIFO ; -ath9k_hw_updatetxtriglevel (ah, true); +else { +if (status & AR_ExcessiveRetries) + ts->ts_status |=ATH9K_TXERR_XRETRY ; +if (status & AR_Filtered) + ts->ts_status |=ATH9K_TXERR_FILT ; +if (status & AR_FIFOUnderrun) { + ts->ts_status |=ATH9K_TXERR_FIFO ; +ath9k_hw_updatetxtriglevel (ah, true); + } }if (status & AR_TxTimerExpired) ts->ts_status |=ATH9K_TXERR_TIMER_EXPIRED ;
Signature · 1 line
1.7.2.2
PATCH 2/3 ath9k: fix handling of rate control probe frames
The ath9k aggregation code was already checking the rate control probe flag to prevent starting an aggregate frame with a sampling rate. What was missing was closing an aggregate before adding a probing frame to it. Without that, rate control cannot have precise control over probing, which delays using faster rates when the channel conditions improve.
--- drivers/net/wireless/ath/ath9k/xmit.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
drivers/net/wireless/ath/ath9k/xmit.c +6 -0
@@ -673,6 +673,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_aggr(struct ath_softc *sc,u16 aggr_limit =0 , al =0 , bpad =0 , al_delta, h_baw = tid->baw_size /2 ;enum ATH_AGGR_STATUS status =ATH_AGGR_DONE ; +struct ieee80211_tx_info *tx_info; bf_first = list_first_entry(&tid->buf_q, struct ath_buf, list);
@@ -699,6 +700,11 @@ static enum ATH_AGGR_STATUS ath_tx_form_aggr(struct ath_softc *sc,break ; } + tx_info =IEEE80211_SKB_CB (bf->bf_mpdu); +if (nframes && ((tx_info->flags &IEEE80211_TX_CTL_RATE_CTRL_PROBE ) || + !(tx_info->control.rates[0 ].flags &IEEE80211_TX_RC_MCS ))) +break ; +/* do not exceed subframe limit */ if (nframes >=min ((int )h_baw,ATH_AMPDU_SUBFRAME_DEFAULT )) { status =ATH_AGGR_LIMITED ;
Signature · 1 line
1.7.2.2
PATCH 3/3 mac80211: minstrel_ht - reduce the overhead of rate sampling
- reduce the number of retransmission attempts for sample rates
- sample lower rates less often
- do not use RTS/CTS for sampling frames
- increase the time between sampling attempts
--- net/mac80211/rc80211_minstrel_ht.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-)
net/mac80211/rc80211_minstrel_ht.c +10 -6
@@ -407,8 +407,8 @@ minstrel_ht_tx_status(void *priv, struct ieee80211_supported_band *sband, mi->ampdu_len += info->status.ampdu_len;if (!mi->sample_wait && !mi->sample_tries && mi->sample_count >0 ) { - mi->sample_wait =4 +2 *MINSTREL_TRUNC (mi->avg_ampdu_len); - mi->sample_tries =3 ; + mi->sample_wait =16 +2 *MINSTREL_TRUNC (mi->avg_ampdu_len); + mi->sample_tries =2 ; mi->sample_count--; }
@@ -506,7 +506,9 @@ minstrel_ht_set_rate(struct minstrel_priv *mp, struct minstrel_ht_sta *mi,if (!mr->retry_updated)minstrel_calc_retransmit (mp, mi, index); -if (mr->probability <MINSTREL_FRAC (20 ,100 )) +if (sample) + rate->count =1 ; +else if (mr->probability <MINSTREL_FRAC (20 ,100 )) rate->count =2 ;else if (rtscts) rate->count = mr->retry_count_rtscts;
@@ -562,7 +564,7 @@ minstrel_get_sample_rate(struct minstrel_priv *mp, struct minstrel_ht_sta *mi)*/ if (minstrel_get_duration (sample_idx) >minstrel_get_duration (mi->max_tp_rate)) { -if (mr->sample_skipped <10 ) +if (mr->sample_skipped <20 ) goto next;if (mi->sample_slow++ >2 )
@@ -586,6 +588,7 @@ minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,struct minstrel_ht_sta *mi = &msp->ht;struct minstrel_priv *mp = priv;int sample_idx; +bool sample = false;if (rate_control_send_low (sta, priv_sta, txrc))return ;
@@ -596,10 +599,11 @@ minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta, info->flags |= mi->tx_flags; sample_idx =minstrel_get_sample_rate (mp, mi);if (sample_idx >=0 ) { + sample = true;minstrel_ht_set_rate (mp, mi, &ar[0 ], sample_idx, txrc, true, false);minstrel_ht_set_rate (mp, mi, &ar[1 ], mi->max_tp_rate, - txrc, false, true); + txrc, false, false); info->flags |=IEEE80211_TX_CTL_RATE_CTRL_PROBE ; }else { minstrel_ht_set_rate(mp, mi, &ar[0], mi->max_tp_rate,
@@ -607,7 +611,7 @@ minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,minstrel_ht_set_rate (mp, mi, &ar[1 ], mi->max_tp_rate2, txrc, false, true); } -minstrel_ht_set_rate (mp, mi, &ar[2 ], mi->max_prob_rate, txrc, false, true); +minstrel_ht_set_rate (mp, mi, &ar[2 ], mi->max_prob_rate, txrc, false, !sample); ar[3 ].count =0 ; ar[3 ].idx =-1 ;
Signature · 1 line
1.7.2.2