diff options
| author |   Vivek Natarajan <vnatarajan@atheros.com> | 2010-08-12 14:23:28 +0530 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2010-08-13 13:46:19 -0400 |
| commit | 71ba186c123630ddab17667ec9ecf7e2ef211295 (patch) | |
| tree | b5407869aa8d4b55751cc59bc85ef9882ff952b0 /drivers/net/wireless/ath/ath9k/htc_drv_main.c | |
| parent | ath9k_htc: fix panic on packet injection using airbase-ng tool. (diff) | |
| download | linux-dev-71ba186c123630ddab17667ec9ecf7e2ef211295.tar.xz linux-dev-71ba186c123630ddab17667ec9ecf7e2ef211295.zip | |
ath9k_htc: Fix disconnect issue in HT40 mode.
Some APs advertise that they may be HT40 capable in the capabilites
but the current operating channel configuration may be only HT20.
This causes disconnection as ath9k_htc sets WLAN_RC_40_FLAG despite
the AP operating in HT20 mode.
Hence set this flag only if the current channel configuration
is HT40 enabled.
Cc: stable@kernel.org
Signed-off-by: Vivek Natarajan <vnatarajan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c index ebed9d1691a5..7d09b4b17bbd 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c @@ -366,7 +366,8 @@ static void ath9k_htc_setup_rate(struct ath9k_htc_priv *priv, caps = WLAN_RC_HT_FLAG; if (sta->ht_cap.mcs.rx_mask[1]) caps |= WLAN_RC_DS_FLAG; - if (sta->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40) + if ((sta->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40) && + (conf_is_ht40(&priv->hw->conf))) caps |= WLAN_RC_40_FLAG; if (conf_is_ht40(&priv->hw->conf) && (sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_40)) |