UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ath9k_htc: Remove OP_PROTECT_ENABLE 

CTS protection can be obtained from mac80211 directly.

Signed-off-by: Sujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Sujith Manoharan 2011-02-21 07:48:31 +05:30 committed by John W. Linville
parent cf04e77286
commit 9304c82d8f
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/wireless/ath/ath9k/htc.h
View File

@ -335,12 +335,11 @@ void ath_htc_cancel_btcoex_work(struct ath9k_htc_priv *priv);
#define OP_SCANNING BIT(1)
#define OP_LED_ASSOCIATED BIT(2)
#define OP_LED_ON BIT(3)
#define OP_PROTECT_ENABLE BIT(4)
#define OP_ASSOCIATED BIT(5)
#define OP_ENABLE_BEACON BIT(6)
#define OP_LED_DEINIT BIT(7)
#define OP_BT_PRIORITY_DETECTED BIT(8)
#define OP_BT_SCAN BIT(9)
#define OP_ASSOCIATED BIT(4)
#define OP_ENABLE_BEACON BIT(5)
#define OP_LED_DEINIT BIT(6)
#define OP_BT_PRIORITY_DETECTED BIT(7)
#define OP_BT_SCAN BIT(8)
struct ath9k_htc_priv {
struct device *dev;

10
drivers/net/wireless/ath/ath9k/htc_drv_main.c
View File

@ -1524,16 +1524,6 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,
ath9k_htc_beacon_config(priv, vif);
}
if (changed & BSS_CHANGED_ERP_CTS_PROT) {
ath_dbg(common, ATH_DBG_CONFIG, "BSS Changed CTS PROT %d\n",
bss_conf->use_cts_prot);
if (bss_conf->use_cts_prot &&
hw->conf.channel->band != IEEE80211_BAND_5GHZ)
priv->op_flags |= OP_PROTECT_ENABLE;
else
priv->op_flags &= ~OP_PROTECT_ENABLE;
}
if (changed & BSS_CHANGED_ERP_SLOT) {
if (bss_conf->use_short_slot)
ah->slottime = 9;

2
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
View File

@ -156,7 +156,7 @@ int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, struct sk_buff *skb)
/* CTS-to-self */
if (!(flags & ATH9K_HTC_TX_RTSCTS) &&
(priv->op_flags & OP_PROTECT_ENABLE))
(vif && vif->bss_conf.use_cts_prot))
flags |= ATH9K_HTC_TX_CTSONLY;
tx_hdr.flags = cpu_to_be32(flags);