Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf04e772 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k_htc: Remove OP_PREAMBLE_SHORT 



mac80211's BSS info can be used for this.

Signed-off-by: default avatarSujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ab77c70a

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

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

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

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