Commit 88a4f56e authored by Oleksij Rempel's avatar Oleksij Rempel Committed by John W. Linville
Browse files

ath9k_htc: use ath_beacon_conf.enable_beacon 



to reduce difference between ath9k and ath9k_htc

Signed-off-by: default avatarOleksij Rempel <linux@rempel-privat.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a099874e

drivers/net/wireless/ath/ath9k/htc.h

+0 −1
Original line number Diff line number Diff line
@@ -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)

drivers/net/wireless/ath/ath9k/htc_drv_beacon.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

drivers/net/wireless/ath/ath9k/htc_drv_main.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE