brcm80211: smac: drop "40MHz intolerant" flag from HT capability info (6b1a89af) · Commits · 戴 / test

The brcmsmac driver registered with mac80211 with HT capability info set to 40MHz intolerant. This cause any other station on the channel to be forced to use 20MHz. This flag has been removed. Reported-by:

Johannes Berg <johannes@sipsolutions.net> Reviewed-by:

Alwin Beukers <alwin@broadcom.com> Reviewed-by:

Roland Vossen <rvossen@broadcom.com> Signed-off-by:

Arend van Spriel <arend@broadcom.com> Signed-off-by:

John W. Linville <linville@tuxdriver.com>

drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -215,8 +215,7 @@ static const struct ieee80211_supported_band brcms_band_2GHz_nphy_template = {
		.ht_cap = {
		/* from include/linux/ieee80211.h */
		.cap = IEEE80211_HT_CAP_GRN_FLD \|
		IEEE80211_HT_CAP_SGI_20 \|
		IEEE80211_HT_CAP_SGI_40 \| IEEE80211_HT_CAP_40MHZ_INTOLERANT,
		IEEE80211_HT_CAP_SGI_20 \| IEEE80211_HT_CAP_SGI_40,
		.ht_supported = true,
		.ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K,
		.ampdu_density = AMPDU_DEF_MPDU_DENSITY,
		@@ -237,8 +236,7 @@ static const struct ieee80211_supported_band brcms_band_5GHz_nphy_template = {
		BRCMS_LEGACY_5G_RATE_OFFSET,
		.ht_cap = {
		.cap = IEEE80211_HT_CAP_GRN_FLD \| IEEE80211_HT_CAP_SGI_20 \|
		IEEE80211_HT_CAP_SGI_40 \|
		IEEE80211_HT_CAP_40MHZ_INTOLERANT, /* No 40 mhz yet */
		IEEE80211_HT_CAP_SGI_40,
		.ht_supported = true,
		.ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K,
		.ampdu_density = AMPDU_DEF_MPDU_DENSITY,

Admin message