leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ath9k_htc: Remove OP_PREAMBLE_SHORT

Browse Source 
mac80211's BSS info can be used for this.

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:24 +05:30 committed by John W. Linville
parent ab77c70a15
commit cf04e77286
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -335,13 +335,12 @@ 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_PREAMBLE_SHORT BIT(4)
#define OP_PROTECT_ENABLE BIT(5)
#define OP_ASSOCIATED BIT(6)
#define OP_ENABLE_BEACON BIT(7)
#define OP_LED_DEINIT BIT(8)
#define OP_BT_PRIORITY_DETECTED BIT(9)
#define OP_BT_SCAN BIT(10)
#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)
struct ath9k_htc_priv {
struct device *dev;

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

@ -1524,15 +1524,6 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,
ath9k_htc_beacon_config(priv, vif);
}
if (changed & BSS_CHANGED_ERP_PREAMBLE) {
ath_dbg(common, ATH_DBG_CONFIG, "BSS Changed PREAMBLE %d\n",
bss_conf->use_short_preamble);
if (bss_conf->use_short_preamble)
priv->op_flags |= OP_PREAMBLE_SHORT;
else
priv->op_flags &= ~OP_PREAMBLE_SHORT;
}
if (changed & BSS_CHANGED_ERP_CTS_PROT) {
ath_dbg(common, ATH_DBG_CONFIG, "BSS Changed CTS PROT %d\n",
bss_conf->use_cts_prot);