ath9k_htc: Remove OP_PREAMBLE_SHORT

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>

diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h
index ab8d1f0cba137d19fe4f6da882566064ad696ffe..ed6af32f963e45297e85c6b90a93894ab7a80cb0 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc.h
+++ b/drivers/net/wireless/ath/ath9k/htc.h
@@ -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;

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index ebc5dbfb6a1b086c0943a8b0194b79832e30a7e3..13e9deca67909ea0adfb52673b5ff377d9256406 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -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);