wifi: rtw89: support channel switch and correct EHT settings
Ping-Ke Shih
maintainercover wifi: rtw89: support channel switch and correct EHT settings
First three patches are to support channel switch. The patch 4/5 is to adjust EHT PHY status report for RX packets. The last patch is to correct non-AP STA behavior under EHT 20MHz bandwidth.
Eric Huang (1):
wifi: rtw89: add EHT physts and adjust init flow accordingly
Kuan-Chung Chen (1):
wifi: rtw89: fix EHT 20MHz TX rate for non-AP STA
Zong-Zhe Yang (3):
wifi: rtw89: chan: concentrate the logic of setting/clearing chanctx
bitmap
wifi: rtw89: chan: re-config default chandef only when none is
registered
wifi: rtw89: implement channel switch support
drivers/net/wireless/realtek/rtw89/chan.c | 58 ++++++++++--- drivers/net/wireless/realtek/rtw89/chan.h | 6 ++ drivers/net/wireless/realtek/rtw89/core.c | 40 +++++++++ drivers/net/wireless/realtek/rtw89/core.h | 2 + drivers/net/wireless/realtek/rtw89/mac80211.c | 72 +++++++++++++++ drivers/net/wireless/realtek/rtw89/phy.c | 87 ++++++++++--------- drivers/net/wireless/realtek/rtw89/phy.h | 1 + drivers/net/wireless/realtek/rtw89/reg.h | 1 + 8 files changed, 215 insertions(+), 52 deletions(-)
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 1/5 wifi: rtw89: chan: concentrate the logic of setting/clearing chanctx bitmap
From: Zong-Zhe Yang <[email protected]>
Originally, the logic for setting bits was wrapped inside the configuring function. However, raw clearing bits, clear_bit, was called directly. To be more paired and more understandable. Concentrate the logic of them into the same function.
(don't change logic at all)
--- drivers/net/wireless/realtek/rtw89/chan.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/net/wireless/realtek/rtw89/chan.c +12 -9
@@ -170,22 +170,26 @@ int rtw89_iterate_entity_chan(struct rtw89_dev *rtwdev,static void __rtw89_config_entity_chandef (struct rtw89_dev *rtwdev,enum rtw89_chanctx_idx idx, -const struct cfg80211_chan_def *chandef, -bool from_stack) +const struct cfg80211_chan_def *chandef) {struct rtw89_hal *hal = &rtwdev->hal; hal->chanctx[idx].chandef = *chandef; - -if (from_stack) -set_bit (idx, hal->entity_map); }void rtw89_config_entity_chandef (struct rtw89_dev *rtwdev,enum rtw89_chanctx_idx idx,const struct cfg80211_chan_def *chandef) { -__rtw89_config_entity_chandef (rtwdev, idx, chandef, true); +struct rtw89_hal *hal = &rtwdev->hal; + +if (!chandef) { +clear_bit (idx, hal->entity_map); +return ; + } + +__rtw89_config_entity_chandef (rtwdev, idx, chandef); +set_bit (idx, hal->entity_map); } void rtw89_config_roc_chandef(struct rtw89_dev *rtwdev,
@@ -227,7 +231,7 @@ static void rtw89_config_default_chandef(struct rtw89_dev *rtwdev)struct cfg80211_chan_def chandef = {0 };rtw89_get_default_chandef (&chandef); -__rtw89_config_entity_chandef (rtwdev,RTW89_CHANCTX_0 , &chandef, false); +__rtw89_config_entity_chandef (rtwdev,RTW89_CHANCTX_0 , &chandef); }void rtw89_entity_init (struct rtw89_dev *rtwdev)
@@ -2782,10 +2786,9 @@ int rtw89_chanctx_ops_add(struct rtw89_dev *rtwdev,void rtw89_chanctx_ops_remove (struct rtw89_dev *rtwdev,struct ieee80211_chanctx_conf *ctx) { -struct rtw89_hal *hal = &rtwdev->hal;struct rtw89_chanctx_cfg *cfg = (struct rtw89_chanctx_cfg *)ctx->drv_priv; -clear_bit (cfg->idx, hal->entity_map); +rtw89_config_entity_chandef (rtwdev, cfg->idx,NULL ); } void rtw89_chanctx_ops_change(struct rtw89_dev *rtwdev,
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerRe: [PATCH rtw-next 1/5] wifi: rtw89: chan: concentrate the logic of setting/clearing chanctx bitmap
Quoted 11 lines · Ping-Ke Shih
From: Zong-Zhe Yang <[email protected]>
Originally, the logic for setting bits was wrapped inside the configuring function. However, raw clearing bits,
clear_bit, was called directly. To be more paired and more understandable. Concentrate the logic of them into the same function.(don't change logic at all)
Signed-off-by Zong-Zhe Yang <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
5 patch(es) applied to rtw-next branch of rtw.git, thanks.
6cd93f85af7a wifi: rtw89: chan: concentrate the logic of setting/clearing chanctx bitmap 6c661eec292c wifi: rtw89: chan: re-config default chandef only when none is registered edba3f107844 wifi: rtw89: implement channel switch support28bb3d842e8f wifi: rtw89: add EHT physts and adjust init flow accordingly fe30a8ae853b wifi: rtw89: fix EHT 20MHz TX rate for non-AP STA
Ping-Ke Shih
maintainerPATCH 2/5 wifi: rtw89: chan: re-config default chandef only when none is registered
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
Previously, default chandef is configured if no chanctx is active, i.e. no chanctx is assigned to some vif. For normal cases, it's fine. However, for impending CSA support, need to consider that one chanctx may be added, or called registered, ahead without being assigned immediately. Then, it will keep inactive, and might be covered by the default one when re-calculating chanctxs happens in certain sequences. So now, don't re-config the default chandef unless no chanctx is registered.
--- drivers/net/wireless/realtek/rtw89/chan.c | 5 ++++- drivers/net/wireless/realtek/rtw89/chan.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/chan.c +4 -1
@@ -269,6 +269,8 @@ static void rtw89_entity_calculate_weight(struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif;int idx; + w->registered_chanctxs =bitmap_weight (hal->entity_map,NUM_OF_RTW89_CHANCTX ); +for_each_set_bit (idx, hal->entity_map,NUM_OF_RTW89_CHANCTX ) { cfg = hal->chanctx[idx].cfg;if (!cfg) {
@@ -477,7 +479,8 @@ enum rtw89_entity_mode rtw89_entity_recalc(struct rtw89_dev *rtwdev)bitmap_zero (recalc_map,NUM_OF_RTW89_CHANCTX ); fallthrough;case 0 : -rtw89_config_default_chandef (rtwdev); +if (!w.registered_chanctxs) +rtw89_config_default_chandef (rtwdev);set_bit (RTW89_CHANCTX_0 , recalc_map); fallthrough;case 1 :
drivers/net/wireless/realtek/rtw89/chan.h +1 -0
@@ -58,6 +58,7 @@ struct rtw89_chanctx_cb_parm { };struct rtw89_entity_weight { +unsigned int registered_chanctxs;unsigned int active_chanctxs;unsigned int active_roles; };
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 3/5 wifi: rtw89: implement channel switch support
In reply to Ping-Ke ShihFrom: Zong-Zhe Yang <[email protected]>
To support channel switch on STA mode, declare IEEE80211_HW_CHANCTX_STA_CSA and implement ieee80211_ops::switch_vif_chanctx. Handling of CSA procedure still relies on mac80211 SW flow, since FW doesn't support chanctx offload. To support channel switch on AP mode, declare WIPHY_FLAG_HAS_CHANNEL_SWITCH and implement ieee80211_ops::channel_switch_beacon additionally.
--- drivers/net/wireless/realtek/rtw89/chan.c | 32 +++++++++ drivers/net/wireless/realtek/rtw89/chan.h | 5 ++ drivers/net/wireless/realtek/rtw89/core.c | 40 +++++++++++ drivers/net/wireless/realtek/rtw89/core.h | 2 + drivers/net/wireless/realtek/rtw89/mac80211.c | 72 +++++++++++++++++++ 5 files changed, 151 insertions(+)
drivers/net/wireless/realtek/rtw89/chan.c +32 -0
@@ -2912,3 +2912,35 @@ void rtw89_chanctx_ops_unassign_vif(struct rtw89_dev *rtwdev,break ; } } + +int rtw89_chanctx_ops_reassign_vif (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link, +struct ieee80211_chanctx_conf *old_ctx, +struct ieee80211_chanctx_conf *new_ctx, +bool replace) +{ +int ret; + +rtw89_chanctx_ops_unassign_vif (rtwdev, rtwvif_link, old_ctx); + +if (!replace) + goto assign; + +rtw89_chanctx_ops_remove (rtwdev, old_ctx); + ret =rtw89_chanctx_ops_add (rtwdev, new_ctx); +if (ret) { +rtw89_err (rtwdev,"%s: failed to add chanctx: %d\n" , + __func__, ret); +return ret; + } + +assign: + ret =rtw89_chanctx_ops_assign_vif (rtwdev, rtwvif_link, new_ctx); +if (ret) { +rtw89_err (rtwdev,"%s: failed to assign chanctx: %d\n" , + __func__, ret); +return ret; + } + +return 0 ; +}
drivers/net/wireless/realtek/rtw89/chan.h +5 -0
@@ -143,5 +143,10 @@ int rtw89_chanctx_ops_assign_vif(struct rtw89_dev *rtwdev,void rtw89_chanctx_ops_unassign_vif (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link,struct ieee80211_chanctx_conf *ctx); +int rtw89_chanctx_ops_reassign_vif (struct rtw89_dev *rtwdev, +struct rtw89_vif_link *rtwvif_link, +struct ieee80211_chanctx_conf *old_ctx, +struct ieee80211_chanctx_conf *new_ctx, +bool replace);#endif
drivers/net/wireless/realtek/rtw89/core.c +40 -0
@@ -204,6 +204,7 @@ static const struct ieee80211_iface_combination rtw89_iface_combs[] = { };static const u8 rtw89_ext_capa_sta[] = { + [0 ] =WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING , [2 ] =WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT , [7 ] =WLAN_EXT_CAPA8_OPMODE_NOTIF , };
@@ -4655,6 +4656,43 @@ void rtw89_core_update_beacon_work(struct wiphy *wiphy, struct wiphy_work *work)rtw89_chip_h2c_update_beacon (rtwdev, rtwvif_link); } +void rtw89_core_csa_beacon_work (struct wiphy *wiphy,struct wiphy_work *work) +{ +struct rtw89_vif_link *rtwvif_link = + container_of(work, struct rtw89_vif_link, csa_beacon_work.work); +struct rtw89_vif *rtwvif = rtwvif_link->rtwvif; +struct ieee80211_vif *vif =rtwvif_to_vif (rtwvif); +struct rtw89_dev *rtwdev = rtwvif->rtwdev; +struct ieee80211_bss_conf *bss_conf; +unsigned int delay; + +lockdep_assert_wiphy (wiphy); + +if (rtwvif_link->net_type !=RTW89_NET_TYPE_AP_MODE ) +return ; + +rcu_read_lock (); + + bss_conf =rtw89_vif_rcu_dereference_link (rtwvif_link, true); +if (!bss_conf->csa_active) { +rcu_read_unlock (); +return ; + } + + delay =ieee80211_tu_to_usec (bss_conf->beacon_int); + +rcu_read_unlock (); + +if (!ieee80211_beacon_cntdwn_is_complete (vif, rtwvif_link->link_id)) { +rtw89_chip_h2c_update_beacon (rtwdev, rtwvif_link); + +wiphy_delayed_work_queue (wiphy, &rtwvif_link->csa_beacon_work, +usecs_to_jiffies (delay)); + }else { +ieee80211_csa_finish (vif, rtwvif_link->link_id); + } +} +int rtw89_wait_for_cond (struct rtw89_wait_info *wait,unsigned int cond) {struct completion *cmpl = &wait->completion;
@@ -5504,6 +5542,7 @@ static int rtw89_core_register_hw(struct rtw89_dev *rtwdev)ieee80211_hw_set (hw,SINGLE_SCAN_ON_ALL_BANDS );ieee80211_hw_set (hw,SUPPORTS_MULTI_BSSID );ieee80211_hw_set (hw,WANT_MONITOR_VIF ); +ieee80211_hw_set (hw,CHANCTX_STA_CSA );if (chip->support_bandwidths &BIT (NL80211_CHAN_WIDTH_160 ))ieee80211_hw_set (hw,SUPPORTS_VHT_EXT_NSS_BW );
@@ -5530,6 +5569,7 @@ static int rtw89_core_register_hw(struct rtw89_dev *rtwdev) hw->wiphy->flags |=WIPHY_FLAG_SUPPORTS_TDLS |WIPHY_FLAG_TDLS_EXTERNAL_SETUP |WIPHY_FLAG_AP_UAPSD | +WIPHY_FLAG_HAS_CHANNEL_SWITCH |WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK ;if (!chip->support_rnr)
drivers/net/wireless/realtek/rtw89/core.h +2 -0
@@ -3533,6 +3533,7 @@ struct rtw89_vif_link {bool pwr_diff_en;u8 def_tri_idx;struct wiphy_work update_beacon_work; +struct wiphy_delayed_work csa_beacon_work;struct rtw89_addr_cam_entry addr_cam;struct rtw89_bssid_cam_entry bssid_cam;struct ieee80211_tx_queue_params tx_params[IEEE80211_NUM_ACS ];
@@ -7317,6 +7318,7 @@ void rtw89_complete_cond(struct rtw89_wait_info *wait, unsigned int cond,int rtw89_core_start (struct rtw89_dev *rtwdev);void rtw89_core_stop (struct rtw89_dev *rtwdev);void rtw89_core_update_beacon_work (struct wiphy *wiphy,struct wiphy_work *work); +void rtw89_core_csa_beacon_work (struct wiphy *wiphy,struct wiphy_work *work);void rtw89_roc_work (struct wiphy *wiphy,struct wiphy_work *work);void rtw89_roc_start (struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif);void rtw89_roc_end (struct rtw89_dev *rtwdev,struct rtw89_vif *rtwvif);
drivers/net/wireless/realtek/rtw89/mac80211.c +72 -0
96 lines not on this page · raw message
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 4/5 wifi: rtw89: add EHT physts and adjust init flow accordingly
In reply to Ping-Ke ShihFrom: Eric Huang <[email protected]>
Adding EHT physts and adjust IE bitmap initialization. This setting is for PHY statistic gathering, won't effect functionality.
--- drivers/net/wireless/realtek/rtw89/phy.c | 75 ++++++++++++------------ drivers/net/wireless/realtek/rtw89/phy.h | 1 + drivers/net/wireless/realtek/rtw89/reg.h | 1 + 3 files changed, 40 insertions(+), 37 deletions(-)
drivers/net/wireless/realtek/rtw89/phy.c +38 -37
@@ -5828,14 +5828,20 @@ void rtw89_phy_env_monitor_track(struct rtw89_dev *rtwdev)__rtw89_phy_env_monitor_track (rtwdev, bb); } -static bool rtw89_physts_ie_page_valid (enum rtw89_phy_status_bitmap *ie_page) +static bool rtw89_physts_ie_page_valid (struct rtw89_dev *rtwdev, +enum rtw89_phy_status_bitmap *ie_page) { +const struct rtw89_chip_info *chip = rtwdev->chip; +if (*ie_page >=RTW89_PHYSTS_BITMAP_NUM || *ie_page ==RTW89_RSVD_9 )return false; -else if (*ie_page >RTW89_RSVD_9 ) +else if (*ie_page >RTW89_RSVD_9 && *ie_page <RTW89_EHT_PKT ) *ie_page -=1 ; +if (*ie_page ==RTW89_EHT_PKT && chip->chip_gen ==RTW89_CHIP_AX ) +return false; +return true; }
@@ -5843,6 +5849,9 @@ static u32 rtw89_phy_get_ie_bitmap_addr(enum rtw89_phy_status_bitmap ie_page) {static const u8 ie_page_shift =2 ; +if (ie_page ==RTW89_EHT_PKT ) +return R_PHY_STS_BITMAP_EHT ; +return R_PHY_STS_BITMAP_ADDR_START + (ie_page << ie_page_shift); }
@@ -5852,7 +5861,7 @@ static u32 rtw89_physts_get_ie_bitmap(struct rtw89_dev *rtwdev, {u32 addr; -if (!rtw89_physts_ie_page_valid (&ie_page)) +if (!rtw89_physts_ie_page_valid (rtwdev, &ie_page))return 0 ; addr =rtw89_phy_get_ie_bitmap_addr (ie_page);
@@ -5867,7 +5876,7 @@ static void rtw89_physts_set_ie_bitmap(struct rtw89_dev *rtwdev,const struct rtw89_chip_info *chip = rtwdev->chip;u32 addr; -if (!rtw89_physts_ie_page_valid (&ie_page)) +if (!rtw89_physts_ie_page_valid (rtwdev, &ie_page))return ;if (chip->chip_id ==RTL8852A )
@@ -5877,21 +5886,6 @@ static void rtw89_physts_set_ie_bitmap(struct rtw89_dev *rtwdev,rtw89_phy_write32_idx (rtwdev, addr,MASKDWORD , val, phy_idx); } -static void rtw89_physts_enable_ie_bitmap (struct rtw89_dev *rtwdev, -enum rtw89_phy_status_bitmap bitmap, -enum rtw89_phy_status_ie_type ie, -bool enable,enum rtw89_phy_idx phy_idx) -{ -u32 val =rtw89_physts_get_ie_bitmap (rtwdev, bitmap, phy_idx); - -if (enable) - val |=BIT (ie); -else - val &= ~BIT (ie); - -rtw89_physts_set_ie_bitmap (rtwdev, bitmap, val, phy_idx); -} -static void rtw89_physts_enable_fail_report (struct rtw89_dev *rtwdev,bool enable,enum rtw89_phy_idx phy_idx)
@@ -5915,30 +5909,37 @@ static void rtw89_physts_enable_fail_report(struct rtw89_dev *rtwdev,static void __rtw89_physts_parsing_init (struct rtw89_dev *rtwdev,enum rtw89_phy_idx phy_idx) { +const struct rtw89_chip_info *chip = rtwdev->chip; +u32 val;u8 i;rtw89_physts_enable_fail_report (rtwdev, false, phy_idx);for (i =0 ; i <RTW89_PHYSTS_BITMAP_NUM ; i++) { -if (i >=RTW89_CCK_PKT ) -rtw89_physts_enable_ie_bitmap (rtwdev, i, -RTW89_PHYSTS_IE09_FTR_0 , - true, phy_idx); -if ((i >=RTW89_CCK_BRK && i <=RTW89_VHT_MU ) || - (i >=RTW89_RSVD_9 && i <=RTW89_CCK_PKT )) +if (i ==RTW89_RSVD_9 || + (i ==RTW89_EHT_PKT && chip->chip_gen ==RTW89_CHIP_AX ))continue ; -rtw89_physts_enable_ie_bitmap (rtwdev, i, -RTW89_PHYSTS_IE24_OFDM_TD_PATH_A , - true, phy_idx); - } -rtw89_physts_enable_ie_bitmap (rtwdev,RTW89_VHT_PKT , -RTW89_PHYSTS_IE13_DL_MU_DEF , true, phy_idx); -rtw89_physts_enable_ie_bitmap (rtwdev,RTW89_HE_PKT , -RTW89_PHYSTS_IE13_DL_MU_DEF , true, phy_idx); - -/* force IE01 for channel index, only channel field is valid */ -rtw89_physts_enable_ie_bitmap (rtwdev,RTW89_CCK_PKT , -RTW89_PHYSTS_IE01_CMN_OFDM , true, phy_idx); + + val =rtw89_physts_get_ie_bitmap (rtwdev, i, phy_idx); +if (i ==RTW89_HE_MU || i ==RTW89_VHT_MU ) { + val |=BIT (RTW89_PHYSTS_IE13_DL_MU_DEF ); + }else if (i ==RTW89_TRIG_BASE_PPDU ) { + val |=BIT (RTW89_PHYSTS_IE13_DL_MU_DEF ) | +BIT (RTW89_PHYSTS_IE01_CMN_OFDM ); + }else if (i >=RTW89_CCK_PKT ) { + val |=BIT (RTW89_PHYSTS_IE09_FTR_0 ); + + val &= ~(GENMASK (RTW89_PHYSTS_IE07_CMN_EXT_PATH_D , +RTW89_PHYSTS_IE04_CMN_EXT_PATH_A )); + +if (i ==RTW89_CCK_PKT ) + val |=BIT (RTW89_PHYSTS_IE01_CMN_OFDM ); +else if (i >=RTW89_HT_PKT ) + val |=BIT (RTW89_PHYSTS_IE20_DBG_OFDM_FD_USER_SEG_0 ); + } + +rtw89_physts_set_ie_bitmap (rtwdev, i, val, phy_idx); + } }static void rtw89_physts_parsing_init (struct rtw89_dev *rtwdev)
drivers/net/wireless/realtek/rtw89/phy.h +1 -0
@@ -252,6 +252,7 @@ enum rtw89_phy_status_bitmap {RTW89_HT_PKT =13 ,RTW89_VHT_PKT =14 ,RTW89_HE_PKT =15 , +RTW89_EHT_PKT =16 , RTW89_PHYSTS_BITMAP_NUM };
drivers/net/wireless/realtek/rtw89/reg.h +1 -0
@@ -8024,6 +8024,7 @@#define R_PHY_STS_BITMAP_HT 0x076C#define R_PHY_STS_BITMAP_VHT 0x0770#define R_PHY_STS_BITMAP_HE 0x0774 +#define R_PHY_STS_BITMAP_EHT 0x0788#define R_EDCCA_RPTREG_SEL_BE 0x078C#define B_EDCCA_RPTREG_SEL_BE_MSK GENMASK(22, 20)#define R_PMAC_GNT 0x0980
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerPATCH 5/5 wifi: rtw89: fix EHT 20MHz TX rate for non-AP STA
In reply to Ping-Ke ShihFrom: Kuan-Chung Chen <[email protected]>
The 4-octet EHT MCS/NSS subfield is only used for 20 MHz-only non-AP STA. Correct the interpretation of this subfield to prevent improper rate limitations.
--- drivers/net/wireless/realtek/rtw89/phy.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/net/wireless/realtek/rtw89/phy.c +7 -5
@@ -119,10 +119,12 @@ static u64 get_eht_mcs_ra_mask(u8 *max_nss, u8 start_mcs, u8 n_nss)return mask; } -static u64 get_eht_ra_mask (struct ieee80211_link_sta *link_sta) +static u64 get_eht_ra_mask (struct rtw89_vif_link *rtwvif_link, +struct ieee80211_link_sta *link_sta) { -struct ieee80211_sta_eht_cap *eht_cap = &link_sta->eht_cap; +struct ieee80211_vif *vif =rtwvif_link_to_vif (rtwvif_link);struct ieee80211_eht_mcs_nss_supp_20mhz_only *mcs_nss_20mhz; +struct ieee80211_sta_eht_cap *eht_cap = &link_sta->eht_cap;struct ieee80211_eht_mcs_nss_supp_bw *mcs_nss;u8 *he_phy_cap = link_sta->he_cap.he_cap_elem.phy_cap_info;
@@ -136,8 +138,8 @@ static u64 get_eht_ra_mask(struct ieee80211_link_sta *link_sta)/* MCS 9, 11, 13 */ return get_eht_mcs_ra_mask (mcs_nss->rx_tx_max_nss,9 ,3 );case IEEE80211_STA_RX_BW_20 : -if (!(he_phy_cap[0 ] & -IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_MASK_ALL )) { +if (vif->type ==NL80211_IFTYPE_AP && + !(he_phy_cap[0 ] &IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_MASK_ALL )) { mcs_nss_20mhz = &eht_cap->eht_mcs_nss_supp.only_20mhz;/* MCS 7, 9, 11, 13 */ return get_eht_mcs_ra_mask (mcs_nss_20mhz->rx_tx_max_nss,7 ,4 );
@@ -332,7 +334,7 @@ static void rtw89_phy_ra_sta_update(struct rtw89_dev *rtwdev,/* Set the ra mask from sta's capability */ if (link_sta->eht_cap.has_eht) { mode |=RTW89_RA_MODE_EHT ; - ra_mask |=get_eht_ra_mask (link_sta); + ra_mask |=get_eht_ra_mask (rtwvif_link, link_sta);if (rtwdev->hal.no_mcs_12_13) high_rate_masks = rtw89_ra_mask_eht_mcs0_11;
Signature · 1 line
2.25.1