diff options
| author | Arend van Spriel <arend@broadcom.com> | 2011-10-18 08:02:59 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-08 15:54:02 -0500 |
| commit | 6b1a89afbf97f40797255b9543d441ce361dbb52 (patch) | |
| tree | d2564b724b634f74cb4275e7c45620a9b80ab5c0 /drivers | |
| parent | 230382140e043903aa1138bb7ca095d7d23fd164 (diff) | |
brcm80211: smac: drop "40MHz intolerant" flag from HT capability info
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c index ac8d02bd34f2..538b504f9bdd 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | |||
| @@ -215,8 +215,7 @@ static const struct ieee80211_supported_band brcms_band_2GHz_nphy_template = { | |||
| 215 | .ht_cap = { | 215 | .ht_cap = { |
| 216 | /* from include/linux/ieee80211.h */ | 216 | /* from include/linux/ieee80211.h */ |
| 217 | .cap = IEEE80211_HT_CAP_GRN_FLD | | 217 | .cap = IEEE80211_HT_CAP_GRN_FLD | |
| 218 | IEEE80211_HT_CAP_SGI_20 | | 218 | IEEE80211_HT_CAP_SGI_20 | IEEE80211_HT_CAP_SGI_40, |
| 219 | IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_40MHZ_INTOLERANT, | ||
| 220 | .ht_supported = true, | 219 | .ht_supported = true, |
| 221 | .ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K, | 220 | .ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K, |
| 222 | .ampdu_density = AMPDU_DEF_MPDU_DENSITY, | 221 | .ampdu_density = AMPDU_DEF_MPDU_DENSITY, |
| @@ -237,8 +236,7 @@ static const struct ieee80211_supported_band brcms_band_5GHz_nphy_template = { | |||
| 237 | BRCMS_LEGACY_5G_RATE_OFFSET, | 236 | BRCMS_LEGACY_5G_RATE_OFFSET, |
| 238 | .ht_cap = { | 237 | .ht_cap = { |
| 239 | .cap = IEEE80211_HT_CAP_GRN_FLD | IEEE80211_HT_CAP_SGI_20 | | 238 | .cap = IEEE80211_HT_CAP_GRN_FLD | IEEE80211_HT_CAP_SGI_20 | |
| 240 | IEEE80211_HT_CAP_SGI_40 | | 239 | IEEE80211_HT_CAP_SGI_40, |
| 241 | IEEE80211_HT_CAP_40MHZ_INTOLERANT, /* No 40 mhz yet */ | ||
| 242 | .ht_supported = true, | 240 | .ht_supported = true, |
| 243 | .ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K, | 241 | .ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K, |
| 244 | .ampdu_density = AMPDU_DEF_MPDU_DENSITY, | 242 | .ampdu_density = AMPDU_DEF_MPDU_DENSITY, |