From: benthecarman via B4 Relay <devnull+benthecarman1.gmail.com@kernel.org>
To: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Cc: Johannes Berg <johannes@sipsolutions.net>,
linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org,
benthecarman <benthecarman@live.com>
Subject: [PATCH 2/2] wifi: iwlwifi: mld: Fix injected 5 GHz legacy rate
Date: Fri, 09 Oct 2026 21:42:23 -0500 [thread overview]
Message-ID: <20261009-next-v1-2-b370f5302d27@gmail.com> (raw)
In-Reply-To: <20261009-next-v1-0-b370f5302d27@gmail.com>
From: benthecarman <benthecarman@live.com>
iwl_mld_get_inject_tx_rate() hands the legacy rate index from mac80211
to iwl_mld_mac80211_rate_idx_to_fw(), which expects the driver's rate
indices. Outside 2.4 GHz the mac80211 index points into a bitrate
table that starts at 6 Mbps, so a 12 Mbps injection on 5 or 6 GHz goes
out as 5.5 Mbps CCK.
Add IWL_FIRST_OFDM_RATE outside 2.4 GHz, as mvm does for frames that
are not injected.
Fixes: d1e879ec600f ("wifi: iwlwifi: add iwlmld sub-driver")
Assisted-by: Claude:claude-opus-5-5
Signed-off-by: benthecarman <benthecarman@live.com>
---
drivers/net/wireless/intel/iwlwifi/mld/tx.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/mld/tx.c b/drivers/net/wireless/intel/iwlwifi/mld/tx.c
index fc501ac0c..317573b5e 100644
--- a/drivers/net/wireless/intel/iwlwifi/mld/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/tx.c
@@ -599,7 +599,16 @@ static u32 iwl_mld_get_inject_tx_rate(struct iwl_mld *mld,
if (u32_get_bits(info->flags, IEEE80211_TX_CTL_STBC))
result |= RATE_MCS_STBC_MSK;
} else {
- result = iwl_mld_mac80211_rate_idx_to_fw(mld, info, rate->idx);
+ int rate_idx = rate->idx;
+
+ /*
+ * mac80211 indexes the band's bitrates, which start at
+ * 6 Mbps outside 2.4 GHz; remap to our rate indices.
+ */
+ if (info->band != NL80211_BAND_2GHZ)
+ rate_idx += IWL_FIRST_OFDM_RATE;
+
+ result = iwl_mld_mac80211_rate_idx_to_fw(mld, info, rate_idx);
}
if (info->control.antennas)
--
2.55.0
prev parent reply other threads:[~2026-10-10 2:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-10 2:42 [PATCH 0/2] wifi: iwlwifi: fix legacy-rate injection outside 2.4 GHz benthecarman via B4 Relay
2026-10-10 2:42 ` [PATCH 1/2] wifi: iwlwifi: mvm: Fix injected 5 GHz legacy rate benthecarman via B4 Relay
2026-10-10 2:42 ` benthecarman via B4 Relay [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261009-next-v1-2-b370f5302d27@gmail.com \
--to=devnull+benthecarman1.gmail.com@kernel.org \
--cc=benthecarman1@gmail.com \
--cc=benthecarman@live.com \
--cc=johannes@sipsolutions.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=miriam.rachel.korenblit@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®