mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 20:22:09 +00:00
1ec7291e24
There's quite a bit of code accessing sband iftype data
(HE, HE 6 GHz, EHT) and we always need to remember to use
the ieee80211_vif_type_p2p() helper. Add new helpers to
directly get it from the sband/vif rather than having to
call ieee80211_vif_type_p2p().
Convert most code with the following spatch:
@@
expression vif, sband;
@@
-ieee80211_get_he_iftype_cap(sband, ieee80211_vif_type_p2p(vif))
+ieee80211_get_he_iftype_cap_vif(sband, vif)
@@
expression vif, sband;
@@
-ieee80211_get_eht_iftype_cap(sband, ieee80211_vif_type_p2p(vif))
+ieee80211_get_eht_iftype_cap_vif(sband, vif)
@@
expression vif, sband;
@@
-ieee80211_get_he_6ghz_capa(sband, ieee80211_vif_type_p2p(vif))
+ieee80211_get_he_6ghz_capa_vif(sband, vif)
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230604120651.db099f49e764.Ie892966c49e22c7b7ee1073bc684f142debfdc84@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
79 lines
2.3 KiB
C
79 lines
2.3 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* EHT handling
|
|
*
|
|
* Copyright(c) 2021-2023 Intel Corporation
|
|
*/
|
|
|
|
#include "ieee80211_i.h"
|
|
|
|
void
|
|
ieee80211_eht_cap_ie_to_sta_eht_cap(struct ieee80211_sub_if_data *sdata,
|
|
struct ieee80211_supported_band *sband,
|
|
const u8 *he_cap_ie, u8 he_cap_len,
|
|
const struct ieee80211_eht_cap_elem *eht_cap_ie_elem,
|
|
u8 eht_cap_len,
|
|
struct link_sta_info *link_sta)
|
|
{
|
|
struct ieee80211_sta_eht_cap *eht_cap = &link_sta->pub->eht_cap;
|
|
struct ieee80211_he_cap_elem *he_cap_ie_elem = (void *)he_cap_ie;
|
|
u8 eht_ppe_size = 0;
|
|
u8 mcs_nss_size;
|
|
u8 eht_total_size = sizeof(eht_cap->eht_cap_elem);
|
|
u8 *pos = (u8 *)eht_cap_ie_elem;
|
|
|
|
memset(eht_cap, 0, sizeof(*eht_cap));
|
|
|
|
if (!eht_cap_ie_elem ||
|
|
!ieee80211_get_eht_iftype_cap_vif(sband, &sdata->vif))
|
|
return;
|
|
|
|
mcs_nss_size = ieee80211_eht_mcs_nss_size(he_cap_ie_elem,
|
|
&eht_cap_ie_elem->fixed,
|
|
sdata->vif.type ==
|
|
NL80211_IFTYPE_STATION);
|
|
|
|
eht_total_size += mcs_nss_size;
|
|
|
|
/* Calculate the PPE thresholds length only if the header is present */
|
|
if (eht_cap_ie_elem->fixed.phy_cap_info[5] &
|
|
IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT) {
|
|
u16 eht_ppe_hdr;
|
|
|
|
if (eht_cap_len < eht_total_size + sizeof(u16))
|
|
return;
|
|
|
|
eht_ppe_hdr = get_unaligned_le16(eht_cap_ie_elem->optional + mcs_nss_size);
|
|
eht_ppe_size =
|
|
ieee80211_eht_ppe_size(eht_ppe_hdr,
|
|
eht_cap_ie_elem->fixed.phy_cap_info);
|
|
eht_total_size += eht_ppe_size;
|
|
|
|
/* we calculate as if NSS > 8 are valid, but don't handle that */
|
|
if (eht_ppe_size > sizeof(eht_cap->eht_ppe_thres))
|
|
return;
|
|
}
|
|
|
|
if (eht_cap_len < eht_total_size)
|
|
return;
|
|
|
|
/* Copy the static portion of the EHT capabilities */
|
|
memcpy(&eht_cap->eht_cap_elem, pos, sizeof(eht_cap->eht_cap_elem));
|
|
pos += sizeof(eht_cap->eht_cap_elem);
|
|
|
|
/* Copy MCS/NSS which depends on the peer capabilities */
|
|
memset(&eht_cap->eht_mcs_nss_supp, 0,
|
|
sizeof(eht_cap->eht_mcs_nss_supp));
|
|
memcpy(&eht_cap->eht_mcs_nss_supp, pos, mcs_nss_size);
|
|
|
|
if (eht_ppe_size)
|
|
memcpy(eht_cap->eht_ppe_thres,
|
|
&eht_cap_ie_elem->optional[mcs_nss_size],
|
|
eht_ppe_size);
|
|
|
|
eht_cap->has_eht = true;
|
|
|
|
link_sta->cur_max_bandwidth = ieee80211_sta_cap_rx_bw(link_sta);
|
|
link_sta->pub->bandwidth = ieee80211_sta_cur_vht_bw(link_sta);
|
|
}
|