|
@@ -3287,7 +3287,7 @@ static void ath10k_tx_h_add_p2p_noa_ie(struct ath10k *ar,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-static bool ath10k_mac_need_offchan_tx_work(struct ath10k *ar)
|
|
|
|
|
|
+static bool ath10k_mac_tx_frm_has_freq(struct ath10k *ar)
|
|
{
|
|
{
|
|
/* FIXME: Not really sure since when the behaviour changed. At some
|
|
/* FIXME: Not really sure since when the behaviour changed. At some
|
|
* point new firmware stopped requiring creation of peer entries for
|
|
* point new firmware stopped requiring creation of peer entries for
|
|
@@ -3295,8 +3295,8 @@ static bool ath10k_mac_need_offchan_tx_work(struct ath10k *ar)
|
|
* tx credit replenishment and reliability). Assuming it's at least 3.4
|
|
* tx credit replenishment and reliability). Assuming it's at least 3.4
|
|
* because that's when the `freq` was introduced to TX_FRM HTT command.
|
|
* because that's when the `freq` was introduced to TX_FRM HTT command.
|
|
*/
|
|
*/
|
|
- return !(ar->htt.target_version_major >= 3 &&
|
|
|
|
- ar->htt.target_version_minor >= 4);
|
|
|
|
|
|
+ return (ar->htt.target_version_major >= 3 &&
|
|
|
|
+ ar->htt.target_version_minor >= 4);
|
|
}
|
|
}
|
|
|
|
|
|
static int ath10k_mac_tx_wmi_mgmt(struct ath10k *ar, struct sk_buff *skb)
|
|
static int ath10k_mac_tx_wmi_mgmt(struct ath10k *ar, struct sk_buff *skb)
|
|
@@ -3680,7 +3680,7 @@ static void ath10k_tx(struct ieee80211_hw *hw,
|
|
ATH10K_SKB_CB(skb)->vdev_id = ar->scan.vdev_id;
|
|
ATH10K_SKB_CB(skb)->vdev_id = ar->scan.vdev_id;
|
|
spin_unlock_bh(&ar->data_lock);
|
|
spin_unlock_bh(&ar->data_lock);
|
|
|
|
|
|
- if (ath10k_mac_need_offchan_tx_work(ar)) {
|
|
|
|
|
|
+ if (!ath10k_mac_tx_frm_has_freq(ar)) {
|
|
ATH10K_SKB_CB(skb)->htt.freq = 0;
|
|
ATH10K_SKB_CB(skb)->htt.freq = 0;
|
|
ATH10K_SKB_CB(skb)->htt.is_offchan = true;
|
|
ATH10K_SKB_CB(skb)->htt.is_offchan = true;
|
|
|
|
|