Message ID | 20231220043149.56bf8f5cd373.I1ba6905c806be6e0548ed15130c0bbb2ee04c9fd@changeid |
---|---|
State | Superseded |
Headers | show |
Series | cfg80211/mac80211 patches from our internal tree 2023-12-19 | expand |
On Tue, Dec 19, 2023 at 09:57:52AM +0100, Johannes Berg wrote: > On Wed, 2023-12-20 at 04:38 +0200, Miri Korenblit wrote: > > We are missing the flag that indicates that capability > > of 40MHz bandwidth support in HE on the LB. > > Add it. > Jouni, I had basically the same patch and I'm going to apply it... > > However, it breaks two tests in hostap - according to my earlier > analysis, this is because throughput estimation for HE/EHT doesn't take > the AP *operation* into account, only the *capabilities*. That's now fixed in hostap.git.
On Sat, 2023-12-23 at 18:01 +0200, Jouni Malinen wrote: > On Tue, Dec 19, 2023 at 09:57:52AM +0100, Johannes Berg wrote: > > On Wed, 2023-12-20 at 04:38 +0200, Miri Korenblit wrote: > > > We are missing the flag that indicates that capability > > > of 40MHz bandwidth support in HE on the LB. > > > Add it. > > > Jouni, I had basically the same patch and I'm going to apply it... > > > > However, it breaks two tests in hostap - according to my earlier > > analysis, this is because throughput estimation for HE/EHT doesn't take > > the AP *operation* into account, only the *capabilities*. > > That's now fixed in hostap.git. > Thanks :) johannes
diff --git a/drivers/net/wireless/virtual/mac80211_hwsim.c b/drivers/net/wireless/virtual/mac80211_hwsim.c index 3816b0d335f0..a84340c2075f 100644 --- a/drivers/net/wireless/virtual/mac80211_hwsim.c +++ b/drivers/net/wireless/virtual/mac80211_hwsim.c @@ -4044,6 +4044,8 @@ static const struct ieee80211_sband_iftype_data sband_capa_2ghz[] = { IEEE80211_HE_MAC_CAP3_OMI_CONTROL | IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3, .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU, + .phy_cap_info[0] = + IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G, .phy_cap_info[1] = IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK | IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A | @@ -4149,6 +4151,8 @@ static const struct ieee80211_sband_iftype_data sband_capa_2ghz[] = { IEEE80211_HE_MAC_CAP3_OMI_CONTROL | IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3, .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU, + .phy_cap_info[0] = + IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G, .phy_cap_info[1] = IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK | IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A | @@ -4252,6 +4256,8 @@ static const struct ieee80211_sband_iftype_data sband_capa_2ghz[] = { IEEE80211_HE_MAC_CAP3_OMI_CONTROL | IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_3, .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU, + .phy_cap_info[0] = + IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G, .phy_cap_info[1] = IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK | IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A |