diff mbox series

[v2] rtw89: declare HE capabilities in 6G band

Message ID 20220307012741.6371-1-pkshih@realtek.com
State New
Headers show
Series [v2] rtw89: declare HE capabilities in 6G band | expand

Commit Message

Ping-Ke Shih March 7, 2022, 1:27 a.m. UTC
To work properly in 6G band, declare HE 6G capabilities. Without this fix,
it can only TX/RX with OFDM rates.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
v2: use correct le16_encode_bits() and enums.
---
 drivers/net/wireless/realtek/rtw89/core.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

Comments

Kalle Valo March 9, 2022, 11:40 a.m. UTC | #1
Ping-Ke Shih <pkshih@realtek.com> wrote:

> To work properly in 6G band, declare HE 6G capabilities. Without this fix,
> it can only TX/RX with OFDM rates.
> 
> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>

Patch applied to wireless-next.git, thanks.

12b604d4ba69 rtw89: declare HE capabilities in 6G band
diff mbox series

Patch

diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
index a0086b14550a8..2a16e38e36151 100644
--- a/drivers/net/wireless/realtek/rtw89/core.c
+++ b/drivers/net/wireless/realtek/rtw89/core.c
@@ -2383,6 +2383,18 @@  static void rtw89_init_he_cap(struct rtw89_dev *rtwdev,
 			he_cap->he_mcs_nss_supp.tx_mcs_160 = cpu_to_le16(mcs_map);
 		}
 
+		if (band == NL80211_BAND_6GHZ) {
+			__le16 capa;
+
+			capa = le16_encode_bits(IEEE80211_HT_MPDU_DENSITY_NONE,
+						IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START) |
+			       le16_encode_bits(IEEE80211_VHT_MAX_AMPDU_1024K,
+						IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP) |
+			       le16_encode_bits(IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454,
+						IEEE80211_HE_6GHZ_CAP_MAX_MPDU_LEN);
+			iftype_data[idx].he_6ghz_capa.capa = capa;
+		}
+
 		idx++;
 	}