From: Felix Fietkau <nbd@openwrt.org>
To: linux-wireless@vger.kernel.org
Cc: lrodriguez@atheros.com, linville@tuxdriver.com
Subject: [PATCH 6/7] ath9k/ath9k_htc: remove redundand checks for dual-stream tx support
Date: Sat, 12 Jun 2010 17:22:33 +0200 [thread overview]
Message-ID: <1276356154-66545-6-git-send-email-nbd@openwrt.org> (raw)
In-Reply-To: <1276356154-66545-5-git-send-email-nbd@openwrt.org>
mac80211 already masks the HT sta capabilities based on hardware support
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---
drivers/net/wireless/ath/ath9k/htc_drv_main.c | 7 ++-----
drivers/net/wireless/ath/ath9k/rc.c | 7 ++-----
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index 312ff1b..c0aafa7 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -362,11 +362,8 @@ static void ath9k_htc_setup_rate(struct ath9k_htc_priv *priv,
trate->rates.ht_rates.rs_nrates = j;
caps = WLAN_RC_HT_FLAG;
- if (priv->ah->caps.tx_chainmask != 1 &&
- ath9k_hw_getcapability(priv->ah, ATH9K_CAP_DS, 0, NULL)) {
- if (sta->ht_cap.mcs.rx_mask[1])
- caps |= WLAN_RC_DS_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)
caps |= WLAN_RC_40_FLAG;
if (conf_is_ht40(&priv->hw->conf) &&
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index 02b6052..600ee0b 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -1203,11 +1203,8 @@ static u8 ath_rc_build_ht_caps(struct ath_softc *sc, struct ieee80211_sta *sta,
if (sta->ht_cap.ht_supported) {
caps = WLAN_RC_HT_FLAG;
- if (sc->sc_ah->caps.tx_chainmask != 1 &&
- ath9k_hw_getcapability(sc->sc_ah, ATH9K_CAP_DS, 0, NULL)) {
- if (sta->ht_cap.mcs.rx_mask[1])
- caps |= WLAN_RC_DS_FLAG;
- }
+ if (sta->ht_cap.mcs.rx_mask[1])
+ caps |= WLAN_RC_DS_FLAG;
if (is_cw40)
caps |= WLAN_RC_40_FLAG;
if (is_sgi)
--
1.6.4.2
next prev parent reply other threads:[~2010-06-12 15:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-12 15:22 [PATCH 1/7] ath9k_hw: remove ATH9K_CAP_CIPHER Felix Fietkau
2010-06-12 15:22 ` [PATCH 2/7] ath9k_hw: remove ATH9K_CAP_TXPOW Felix Fietkau
2010-06-12 15:22 ` [PATCH 3/7] ath9k_hw: remove ATH9K_CAP_TKIP_MIC Felix Fietkau
2010-06-12 15:22 ` [PATCH 4/7] ath9k_hw: remove ATH9K_CAP_TKIP_SPLIT Felix Fietkau
2010-06-12 15:22 ` [PATCH 5/7] ath9k_hw: remove ATH9K_CAP_MCAST_KEYSRCH Felix Fietkau
2010-06-12 15:22 ` Felix Fietkau [this message]
2010-06-12 15:22 ` [PATCH 7/7] ath9k_hw: remove ATH9K_CAP_DS Felix Fietkau
2010-06-12 17:28 ` [PATCH 4/7] ath9k_hw: remove ATH9K_CAP_TKIP_SPLIT Pavel Roskin
2010-06-12 17:36 ` Felix Fietkau
2010-06-12 17:46 ` Pavel Roskin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1276356154-66545-6-git-send-email-nbd@openwrt.org \
--to=nbd@openwrt.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=lrodriguez@atheros.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).