diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/htc.h | 11 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_main.c | 10 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 2 |
3 files changed, 6 insertions, 17 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h index ed6af32f963..4e19e14e8c1 100644 --- a/drivers/net/wireless/ath/ath9k/htc.h +++ b/drivers/net/wireless/ath/ath9k/htc.h | |||
@@ -335,12 +335,11 @@ void ath_htc_cancel_btcoex_work(struct ath9k_htc_priv *priv); | |||
335 | #define OP_SCANNING BIT(1) | 335 | #define OP_SCANNING BIT(1) |
336 | #define OP_LED_ASSOCIATED BIT(2) | 336 | #define OP_LED_ASSOCIATED BIT(2) |
337 | #define OP_LED_ON BIT(3) | 337 | #define OP_LED_ON BIT(3) |
338 | #define OP_PROTECT_ENABLE BIT(4) | 338 | #define OP_ASSOCIATED BIT(4) |
339 | #define OP_ASSOCIATED BIT(5) | 339 | #define OP_ENABLE_BEACON BIT(5) |
340 | #define OP_ENABLE_BEACON BIT(6) | 340 | #define OP_LED_DEINIT BIT(6) |
341 | #define OP_LED_DEINIT BIT(7) | 341 | #define OP_BT_PRIORITY_DETECTED BIT(7) |
342 | #define OP_BT_PRIORITY_DETECTED BIT(8) | 342 | #define OP_BT_SCAN BIT(8) |
343 | #define OP_BT_SCAN BIT(9) | ||
344 | 343 | ||
345 | struct ath9k_htc_priv { | 344 | struct ath9k_htc_priv { |
346 | struct device *dev; | 345 | 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 13e9deca679..dbde491f3d9 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c | |||
@@ -1524,16 +1524,6 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw, | |||
1524 | ath9k_htc_beacon_config(priv, vif); | 1524 | ath9k_htc_beacon_config(priv, vif); |
1525 | } | 1525 | } |
1526 | 1526 | ||
1527 | if (changed & BSS_CHANGED_ERP_CTS_PROT) { | ||
1528 | ath_dbg(common, ATH_DBG_CONFIG, "BSS Changed CTS PROT %d\n", | ||
1529 | bss_conf->use_cts_prot); | ||
1530 | if (bss_conf->use_cts_prot && | ||
1531 | hw->conf.channel->band != IEEE80211_BAND_5GHZ) | ||
1532 | priv->op_flags |= OP_PROTECT_ENABLE; | ||
1533 | else | ||
1534 | priv->op_flags &= ~OP_PROTECT_ENABLE; | ||
1535 | } | ||
1536 | |||
1537 | if (changed & BSS_CHANGED_ERP_SLOT) { | 1527 | if (changed & BSS_CHANGED_ERP_SLOT) { |
1538 | if (bss_conf->use_short_slot) | 1528 | if (bss_conf->use_short_slot) |
1539 | ah->slottime = 9; | 1529 | ah->slottime = 9; |
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c index d5f0f41b4de..884deebf8e0 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | |||
@@ -156,7 +156,7 @@ int ath9k_htc_tx_start(struct ath9k_htc_priv *priv, struct sk_buff *skb) | |||
156 | 156 | ||
157 | /* CTS-to-self */ | 157 | /* CTS-to-self */ |
158 | if (!(flags & ATH9K_HTC_TX_RTSCTS) && | 158 | if (!(flags & ATH9K_HTC_TX_RTSCTS) && |
159 | (priv->op_flags & OP_PROTECT_ENABLE)) | 159 | (vif && vif->bss_conf.use_cts_prot)) |
160 | flags |= ATH9K_HTC_TX_CTSONLY; | 160 | flags |= ATH9K_HTC_TX_CTSONLY; |
161 | 161 | ||
162 | tx_hdr.flags = cpu_to_be32(flags); | 162 | tx_hdr.flags = cpu_to_be32(flags); |