mac80211: do intersection with he mcs and nss set of peer and own
Subsystems (2)
PATCH v2 1/1 mac80211: do intersection with he mcs and nss set of peer and own
For VHT capbility, it has intersection of mcs and nss for peer in function ieee80211_vht_cap_ie_to_sta_vht_cap. For HE capbility, it does not have intersection.
This patch is do intersection for HE capbility.
Signed-off-by Wen Gong <[email protected]>
---
v2: fix build warning
net/mac80211/he.c | 90 ++++++++++++++++++++++++++++++++++++++ net/mac80211/ieee80211_i.h | 5 +++ 2 files changed, 95 insertions(+)
net/mac80211/he.c +90 -0
@@ -52,6 +52,59 @@ ieee80211_update_from_he_6ghz_capa(const struct ieee80211_he_6ghz_capa *he_6ghz_ sta->sta.he_6ghz_capa = *he_6ghz_capa; } +void +ieee80211_he_mcs_disable (u16 *he_mcs) +{ +u32 i; + +for (i =0 ; i <8 ; i++) + *he_mcs |=cpu_to_le16 (IEEE80211_HE_MCS_NOT_SUPPORTED << i *2 ); +} + +void +ieee80211_he_mcs_intersection (u16 *he_own_rx,u16 *he_peer_rx, +u16 *he_own_tx,u16 *he_peer_tx) +{ +u32 i; +u16 own_rx, own_tx, peer_rx, peer_tx; + +for (i =0 ; i <8 ; i++) { + own_rx =le16_to_cpu (*he_own_rx); + own_rx = (own_rx >> i *2 ) &IEEE80211_HE_MCS_NOT_SUPPORTED ; + + own_tx =le16_to_cpu (*he_own_tx); + own_tx = (own_tx >> i *2 ) &IEEE80211_HE_MCS_NOT_SUPPORTED ; + + peer_rx =le16_to_cpu (*he_peer_rx); + peer_rx = (peer_rx >> i *2 ) &IEEE80211_HE_MCS_NOT_SUPPORTED ; + + peer_tx =le16_to_cpu (*he_peer_tx); + peer_tx = (peer_tx >> i *2 ) &IEEE80211_HE_MCS_NOT_SUPPORTED ; + +if (peer_tx !=IEEE80211_HE_MCS_NOT_SUPPORTED ) { +if (own_rx ==IEEE80211_HE_MCS_NOT_SUPPORTED ) + peer_tx =IEEE80211_HE_MCS_NOT_SUPPORTED ; +else if (own_rx < peer_tx) + peer_tx = own_rx; + } + +if (peer_rx !=IEEE80211_HE_MCS_NOT_SUPPORTED ) { +if (own_tx ==IEEE80211_HE_MCS_NOT_SUPPORTED ) + peer_rx =IEEE80211_HE_MCS_NOT_SUPPORTED ; +else if (own_tx < peer_rx) + peer_rx = own_tx; + } + + *he_peer_rx &= + ~cpu_to_le16 (IEEE80211_HE_MCS_NOT_SUPPORTED << i *2 ); + *he_peer_rx |=cpu_to_le16 (peer_rx << i *2 ); + + *he_peer_tx &= + ~cpu_to_le16 (IEEE80211_HE_MCS_NOT_SUPPORTED << i *2 ); + *he_peer_tx |=cpu_to_le16 (peer_tx << i *2 ); + } +} + void ieee80211_he_cap_ie_to_sta_he_cap(struct ieee80211_sub_if_data *sdata, struct ieee80211_supported_band *sband,
@@ -60,10 +113,12 @@ ieee80211_he_cap_ie_to_sta_he_cap(struct ieee80211_sub_if_data *sdata, struct sta_info *sta) {struct ieee80211_sta_he_cap *he_cap = &sta->sta.he_cap; +struct ieee80211_sta_he_cap own_he_cap = sband->iftype_data->he_cap;struct ieee80211_he_cap_elem *he_cap_ie_elem = (void *)he_cap_ie;u8 he_ppe_size;u8 mcs_nss_size;u8 he_total_size; +bool own_160, peer_160, own_80p80, peer_80p80;memset (he_cap,0 ,sizeof (*he_cap));
@@ -101,6 +156,41 @@ ieee80211_he_cap_ie_to_sta_he_cap(struct ieee80211_sub_if_data *sdata,if (sband->band ==NL80211_BAND_6GHZ && he_6ghz_capa)ieee80211_update_from_he_6ghz_capa (he_6ghz_capa, sta); + +ieee80211_he_mcs_intersection (&own_he_cap.he_mcs_nss_supp.rx_mcs_80, + &he_cap->he_mcs_nss_supp.rx_mcs_80, + &own_he_cap.he_mcs_nss_supp.tx_mcs_80, + &he_cap->he_mcs_nss_supp.tx_mcs_80); + + own_160 = !!(own_he_cap.he_cap_elem.phy_cap_info[0 ] & +IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G ); + peer_160 = !!(he_cap->he_cap_elem.phy_cap_info[0 ] & +IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G ); + +if (peer_160 && own_160) { +ieee80211_he_mcs_intersection (&own_he_cap.he_mcs_nss_supp.rx_mcs_160, + &he_cap->he_mcs_nss_supp.rx_mcs_160, + &own_he_cap.he_mcs_nss_supp.tx_mcs_160, + &he_cap->he_mcs_nss_supp.tx_mcs_160); + }else if (peer_160 && !own_160) { +ieee80211_he_mcs_disable (&he_cap->he_mcs_nss_supp.rx_mcs_160); +ieee80211_he_mcs_disable (&he_cap->he_mcs_nss_supp.tx_mcs_160); + } + + own_80p80 = !!(own_he_cap.he_cap_elem.phy_cap_info[0 ] & +IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G ); + peer_80p80 = !!(he_cap->he_cap_elem.phy_cap_info[0 ] & +IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G ); + +if (peer_80p80 && own_80p80) { +ieee80211_he_mcs_intersection (&own_he_cap.he_mcs_nss_supp.rx_mcs_80p80, + &he_cap->he_mcs_nss_supp.rx_mcs_80p80, + &own_he_cap.he_mcs_nss_supp.tx_mcs_80p80, + &he_cap->he_mcs_nss_supp.tx_mcs_80p80); + }else if (peer_80p80 && !own_80p80) { +ieee80211_he_mcs_disable (&he_cap->he_mcs_nss_supp.rx_mcs_80p80); +ieee80211_he_mcs_disable (&he_cap->he_mcs_nss_supp.tx_mcs_80p80); + } }void
net/mac80211/ieee80211_i.h +5 -0
@@ -1915,6 +1915,11 @@ ieee80211_sta_rx_bw_to_chan_width(struct sta_info *sta);/* HE */ void +ieee80211_he_mcs_disable (u16 *he_mcs); +void +ieee80211_he_mcs_intersection (u16 *he_own_rx,u16 *he_peer_rx, +u16 *he_own_tx,u16 *he_peer_tx); +void ieee80211_he_cap_ie_to_sta_he_cap(struct ieee80211_sub_if_data *sdata, struct ieee80211_supported_band *sband, const u8 *he_cap_ie, u8 he_cap_len,
Signature · 7 lines
2.23.0 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k