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

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

ath9k_htc: Remove OP_PROTECT_ENABLE 



CTS protection can be obtained from mac80211 directly.

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

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

+5 −6
Original line number Diff line number Diff line
@@ -335,12 +335,11 @@ 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_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)

#define OP_ASSOCIATED		   BIT(4)

#define OP_ENABLE_BEACON	   BIT(5)

#define OP_LED_DEINIT		   BIT(6)

#define OP_BT_PRIORITY_DETECTED    BIT(7)

#define OP_BT_SCAN                 BIT(8)



struct ath9k_htc_priv {

	struct device *dev;

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

+0 −10
Original line number Diff line number Diff line
@@ -1524,16 +1524,6 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw, 
		ath9k_htc_beacon_config(priv, vif);

	}



	if (changed & BSS_CHANGED_ERP_CTS_PROT) {

		ath_dbg(common, ATH_DBG_CONFIG, "BSS Changed CTS PROT %d\n",

			bss_conf->use_cts_prot);

		if (bss_conf->use_cts_prot &&

		    hw->conf.channel->band != IEEE80211_BAND_5GHZ)

			priv->op_flags |= OP_PROTECT_ENABLE;

		else

			priv->op_flags &= ~OP_PROTECT_ENABLE;

	}



	if (changed & BSS_CHANGED_ERP_SLOT) {

		if (bss_conf->use_short_slot)

			ah->slottime = 9;

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

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, struct sk_buff *skb) 


		/* CTS-to-self */

		if (!(flags & ATH9K_HTC_TX_RTSCTS) &&

		    (priv->op_flags & OP_PROTECT_ENABLE))

		    (vif && vif->bss_conf.use_cts_prot))

			flags |= ATH9K_HTC_TX_CTSONLY;



		tx_hdr.flags = cpu_to_be32(flags);