Skip to content

Commit 2c9b922

Browse files
ggreenmajmberg-intel
authored andcommitted
wifi: iwlwifi: mvm: update iwl_mvm_tx_reclaim() for MLO
vif->bss_conf is used in this function only when TLC is not offloaded, so not in MLO flow. Simplify the related "if" condition and call iwl_mvm_hwrate_to_tx_status() only for driver rate scale. Signed-off-by: Gregory Greenman <[email protected]> Link: https://lore.kernel.org/r/20230328104949.c6826d5b5477.Ib56ec6025c0da3a381aaf88e71085ce9b96a9e65@changeid Signed-off-by: Johannes Berg <[email protected]>
1 parent 4263ac7 commit 2c9b922

File tree

1 file changed

+5
-6
lines changed
  • drivers/net/wireless/intel/iwlwifi/mvm

1 file changed

+5
-6
lines changed

drivers/net/wireless/intel/iwlwifi/mvm/tx.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1976,9 +1976,11 @@ static void iwl_mvm_tx_reclaim(struct iwl_mvm *mvm, int sta_id, int tid,
19761976
* possible (i.e. first MPDU in the aggregation wasn't acked)
19771977
* Still it's important to update RS about sent vs. acked.
19781978
*/
1979-
if (!is_flush && skb_queue_empty(&reclaimed_skbs)) {
1979+
if (!is_flush && skb_queue_empty(&reclaimed_skbs) &&
1980+
!iwl_mvm_has_tlc_offload(mvm)) {
19801981
struct ieee80211_chanctx_conf *chanctx_conf = NULL;
19811982

1983+
/* no TLC offload, so non-MLD mode */
19821984
if (mvmsta->vif)
19831985
chanctx_conf =
19841986
rcu_dereference(mvmsta->vif->bss_conf.chanctx_conf);
@@ -1989,11 +1991,8 @@ static void iwl_mvm_tx_reclaim(struct iwl_mvm *mvm, int sta_id, int tid,
19891991
tx_info->band = chanctx_conf->def.chan->band;
19901992
iwl_mvm_hwrate_to_tx_status(mvm->fw, rate, tx_info);
19911993

1992-
if (!iwl_mvm_has_tlc_offload(mvm)) {
1993-
IWL_DEBUG_TX_REPLY(mvm,
1994-
"No reclaim. Update rs directly\n");
1995-
iwl_mvm_rs_tx_status(mvm, sta, tid, tx_info, false);
1996-
}
1994+
IWL_DEBUG_TX_REPLY(mvm, "No reclaim. Update rs directly\n");
1995+
iwl_mvm_rs_tx_status(mvm, sta, tid, tx_info, false);
19971996
}
19981997

19991998
out:

0 commit comments

Comments
 (0)