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

Commit e0813d34 authored by Michal Kazior's avatar Michal Kazior Committed by Kalle Valo
Browse files

ath10k: remove is_offchan 



It was wasteful to keep it in the struct.

Signed-off-by: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 8a933964

drivers/net/wireless/ath/ath10k/core.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/ath/ath10k/mac.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/ath/ath10k/txrx.c

+6 −1
Original line number Diff line number Diff line
@@ -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