| Message ID | 20240207072253.4189-1-spasswolf@web.de (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Felix Fietkau |
| Headers | show |
| Series | wifi: mt76: inititalize sband.band to correct value | expand |
On Wed, 2024-02-07 at 08:22 +0100, Bert Karwatzki wrote: > Set phy->sband_{2,5,6}g.sband.band to the correct enum value, otherwise > the ieee80211_register_hw() will fail to register the device. So turns out that technically, it wasn't needed before because cfg80211 *will* set sband->band, but *mac80211* now requires it to have been set before ... We could do a trivial fix in mac80211 as well: --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -1124,7 +1124,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) supp_he = supp_he || iftd->he_cap.has_he; supp_eht = supp_eht || iftd->eht_cap.has_eht; - if (sband->band == NL80211_BAND_2GHZ) + if (band == NL80211_BAND_2GHZ) he_40_mhz_cap = IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G; else but seems like no other driver even likely needed this, and it's probably less reliable in the long term? Or do both? johannes
diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c index 8a3a90d1bfac..6cf08446f445 100644 --- a/drivers/net/wireless/mediatek/mt76/mac80211.c +++ b/drivers/net/wireless/mediatek/mt76/mac80211.c @@ -363,6 +363,7 @@ mt76_init_sband_2g(struct mt76_phy *phy, struct ieee80211_rate *rates, int n_rates) { phy->hw->wiphy->bands[NL80211_BAND_2GHZ] = &phy->sband_2g.sband; + phy->sband_2g.sband.band = NL80211_BAND_2GHZ; return mt76_init_sband(phy, &phy->sband_2g, mt76_channels_2ghz, ARRAY_SIZE(mt76_channels_2ghz), rates, @@ -374,6 +375,7 @@ mt76_init_sband_5g(struct mt76_phy *phy, struct ieee80211_rate *rates, int n_rates, bool vht) { phy->hw->wiphy->bands[NL80211_BAND_5GHZ] = &phy->sband_5g.sband; + phy->sband_5g.sband.band = NL80211_BAND_5GHZ; return mt76_init_sband(phy, &phy->sband_5g, mt76_channels_5ghz, ARRAY_SIZE(mt76_channels_5ghz), rates, @@ -385,6 +387,7 @@ mt76_init_sband_6g(struct mt76_phy *phy, struct ieee80211_rate *rates, int n_rates) { phy->hw->wiphy->bands[NL80211_BAND_6GHZ] = &phy->sband_6g.sband; + phy->sband_6g.sband.band = NL80211_BAND_6GHZ; return mt76_init_sband(phy, &phy->sband_6g, mt76_channels_6ghz, ARRAY_SIZE(mt76_channels_6ghz), rates,
Set phy->sband_{2,5,6}g.sband.band to the correct enum value, otherwise the ieee80211_register_hw() will fail to register the device. Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218466 Signed-off-by: Bert Karwatzki <spasswolf@web.de> --- drivers/net/wireless/mediatek/mt76/mac80211.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.39.2 It's "Fixes" for commits and "Closes" for bugs, ain't it? Bert Karwatzki