From b69b4333dc832fa6b919893012f160026909c2d9 Mon Sep 17 00:00:00 2001 From: Bob Copeland Date: Sat, 1 Aug 2015 23:56:55 -0400 Subject: [PATCH 4/9] use mgmt tx path for mgmt frames --- drivers/net/wireless/ath/ath10k/mac.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index edb9172..5982808 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -3128,15 +3128,6 @@ ath10k_tx_h_get_txmode(struct ath10k *ar, struct ieee80211_vif *vif, if (!vif || vif->type == NL80211_IFTYPE_MONITOR) return ATH10K_HW_TXRX_RAW; - if (vif->type == NL80211_IFTYPE_MESH_POINT) { - set_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags); - set_bit(ATH10K_FLAG_HW_CRYPTO_DISABLED, &ar->dev_flags); - - ar->wmi.rx_decap_mode = ATH10K_HW_TXRX_RAW; - ar->htt.max_num_amsdu = 1; - return ATH10K_HW_TXRX_RAW; - } - if (ieee80211_is_mgmt(fc)) return ATH10K_HW_TXRX_MGMT; @@ -3172,6 +3163,15 @@ ath10k_tx_h_get_txmode(struct ath10k *ar, struct ieee80211_vif *vif, if (ieee80211_is_data_present(fc) && sta && sta->tdls) return ATH10K_HW_TXRX_ETHERNET; + if (vif->type == NL80211_IFTYPE_MESH_POINT) { + set_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags); + set_bit(ATH10K_FLAG_HW_CRYPTO_DISABLED, &ar->dev_flags); + + ar->wmi.rx_decap_mode = ATH10K_HW_TXRX_RAW; + ar->htt.max_num_amsdu = 1; + return ATH10K_HW_TXRX_RAW; + } + if (test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags)) return ATH10K_HW_TXRX_RAW; -- 2.1.4