ath10k: remove is_offchan

It was wasteful to keep it in the struct.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index 063c34ac76d220cf03e369172b332d252a888312..891e63d67220695a21f4e9810e5c957b1ca554f4 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -89,7 +89,6 @@ struct ath10k_skb_cb {
        struct {
                u8 tid;
                u16 freq;
-               bool is_offchan;
                bool nohwcrypt;
                struct ath10k_htt_txbuf *txbuf;
                u32 txbuf_paddr;

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index fd4c13507790173b138ffbe89b3e1d3318c38754..a14d095fbea56e3990b51fb24ebbf260735388e5 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -3683,7 +3683,6 @@ static void ath10k_tx(struct ieee80211_hw *hw,
 
        txmode = ath10k_mac_tx_h_get_txmode(ar, vif, sta, skb);
 
-       ATH10K_SKB_CB(skb)->htt.is_offchan = false;
        ATH10K_SKB_CB(skb)->htt.freq = 0;
        ATH10K_SKB_CB(skb)->htt.tid = ath10k_tx_h_get_tid(hdr);
        ATH10K_SKB_CB(skb)->htt.nohwcrypt = !ath10k_tx_h_use_hwcrypto(vif, skb);
@@ -3715,7 +3714,6 @@ static void ath10k_tx(struct ieee80211_hw *hw,
 
                if (!ath10k_mac_tx_frm_has_freq(ar)) {
                        ATH10K_SKB_CB(skb)->htt.freq = 0;
-                       ATH10K_SKB_CB(skb)->htt.is_offchan = true;
 
                        ath10k_dbg(ar, ATH10K_DBG_MAC, "queued offchannel skb %p\n",
                                   skb);

diff --git a/drivers/net/wireless/ath/ath10k/txrx.c b/drivers/net/wireless/ath/ath10k/txrx.c
index 6d1105ab4592b1cb6434b9fb6b98702288324b5f..9e14c04ac89f8437ed2a23d51c03b6afc59faa96 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/txrx.c
+++ b/drivers/net/wireless/ath/ath10k/txrx.c
@@ -23,7 +23,12 @@
 
 static void ath10k_report_offchan_tx(struct ath10k *ar, struct sk_buff *skb)
 {
-       if (!ATH10K_SKB_CB(skb)->htt.is_offchan)
+       struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+
+       if (likely(!(info->flags & IEEE80211_TX_CTL_TX_OFFCHAN)))
+               return;
+
+       if (ath10k_mac_tx_frm_has_freq(ar))
                return;
 
        /* If the original wait_for_completion() timed out before