ath9k_htc: use ath_beacon_conf.enable_beacon

to reduce difference between ath9k and ath9k_htc

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
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 69022b08d4d1e3c5ced912aa327d84d5859e52a7..d5a10882bd74ba62727ab6a2e76f66aaf94a191f 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc.h
+++ b/drivers/net/wireless/ath/ath9k/htc.h
@@ -439,7 +439,6 @@ static inline void ath9k_htc_stop_btcoex(struct ath9k_htc_priv *priv)
 
 #define OP_INVALID                BIT(0)
 #define OP_SCANNING               BIT(1)
-#define OP_ENABLE_BEACON           BIT(2)
 #define OP_BT_PRIORITY_DETECTED    BIT(3)
 #define OP_BT_SCAN                 BIT(4)
 #define OP_ANI_RUNNING             BIT(5)

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
index 09ad141b38b6a4f83cbb7424a2040beb805a18a2..4540eacee093a3eb3bf21e08bded1aa817cfd1ab 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
@@ -199,7 +199,7 @@ static void ath9k_htc_beacon_config_ap(struct ath9k_htc_priv *priv,
                } while (nexttbtt < tsftu);
        }
 
-       if (test_bit(OP_ENABLE_BEACON, &priv->op_flags))
+       if (bss_conf->enable_beacon)
                imask |= ATH9K_INT_SWBA;
 
        ath_dbg(common, CONFIG,
@@ -247,7 +247,7 @@ static void ath9k_htc_beacon_config_adhoc(struct ath9k_htc_priv *priv,
        else
                priv->ah->config.sw_beacon_response_time = MIN_SWBA_RESPONSE;
 
-       if (test_bit(OP_ENABLE_BEACON, &priv->op_flags))
+       if (bss_conf->enable_beacon)
                imask |= ATH9K_INT_SWBA;
 
        ath_dbg(common, CONFIG,

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index 90dad4172b0a04a1c61ce7805f1c07e7ed146bd7..40733d03e1a21624e87b857b8be8dd8db5d36a54 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -1529,7 +1529,7 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,
                ath_dbg(common, CONFIG, "Beacon enabled for BSS: %pM\n",
                        bss_conf->bssid);
                ath9k_htc_set_tsfadjust(priv, vif);
-               set_bit(OP_ENABLE_BEACON, &priv->op_flags);
+               priv->cur_beacon_conf.enable_beacon = 1;
                ath9k_htc_beacon_config(priv, vif);
        }
 
@@ -1543,7 +1543,7 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,
                        ath_dbg(common, CONFIG,
                                "Beacon disabled for BSS: %pM\n",
                                bss_conf->bssid);
-                       clear_bit(OP_ENABLE_BEACON, &priv->op_flags);
+                       priv->cur_beacon_conf.enable_beacon = 0;
                        ath9k_htc_beacon_config(priv, vif);
                }
        }