From: Michal Kazior <michal.kazior@tieto.com> To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior <michal.kazior@tieto.com> Subject: [PATCH 5/8] ath10k: remove freq from skb_cb Date: Mon, 2 Nov 2015 15:03:05 +0100 [thread overview] Message-ID: <1446472988-2603-6-git-send-email-michal.kazior@tieto.com> (raw) In-Reply-To: <1446472988-2603-1-git-send-email-michal.kazior@tieto.com> It was wasteful to keep it in the struct. Signed-off-by: Michal Kazior <michal.kazior@tieto.com> --- drivers/net/wireless/ath/ath10k/core.h | 1 - drivers/net/wireless/ath/ath10k/htt_tx.c | 9 +++++++-- drivers/net/wireless/ath/ath10k/mac.c | 5 +---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index f24a5feb2220..64a248f780b9 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -88,7 +88,6 @@ struct ath10k_skb_cb { struct { u8 tid; - u16 freq; bool nohwcrypt; struct ath10k_htt_txbuf *txbuf; u32 txbuf_paddr; diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c index bada9695a4fb..05ce99ad6ca2 100644 --- a/drivers/net/wireless/ath/ath10k/htt_tx.c +++ b/drivers/net/wireless/ath/ath10k/htt_tx.c @@ -531,6 +531,7 @@ int ath10k_htt_tx(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txmode, struct ath10k *ar = htt->ar; struct device *dev = ar->dev; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)msdu->data; + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(msdu); struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(msdu); struct ath10k_hif_sg_item sg_items[2]; struct htt_data_tx_desc_frag *frags; @@ -540,6 +541,7 @@ int ath10k_htt_tx(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txmode, int res; u8 flags0 = 0; u16 msdu_id, flags1 = 0; + u16 freq = 0; u32 frags_paddr = 0; struct htt_msdu_ext_desc *ext_desc = NULL; bool limit_mgmt_desc = false; @@ -591,6 +593,9 @@ int ath10k_htt_tx(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txmode, goto err_free_msdu_id; } + if (unlikely(info->flags & IEEE80211_TX_CTL_TX_OFFCHAN)) + freq = ar->scan.roc_freq; + switch (txmode) { case ATH10K_HW_TXRX_RAW: case ATH10K_HW_TXRX_NATIVE_WIFI: @@ -680,13 +685,13 @@ int ath10k_htt_tx(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txmode, skb_cb->htt.txbuf->cmd_tx.id = __cpu_to_le16(msdu_id); skb_cb->htt.txbuf->cmd_tx.frags_paddr = __cpu_to_le32(frags_paddr); skb_cb->htt.txbuf->cmd_tx.peerid = __cpu_to_le16(HTT_INVALID_PEERID); - skb_cb->htt.txbuf->cmd_tx.freq = __cpu_to_le16(skb_cb->htt.freq); + skb_cb->htt.txbuf->cmd_tx.freq = __cpu_to_le16(freq); trace_ath10k_htt_tx(ar, msdu_id, msdu->len, vdev_id, tid); ath10k_dbg(ar, ATH10K_DBG_HTT, "htt tx flags0 %hhu flags1 %hu len %d id %hu frags_paddr %08x, msdu_paddr %08x vdev %hhu tid %hhu freq %hu\n", flags0, flags1, msdu->len, msdu_id, frags_paddr, - (u32)skb_cb->paddr, vdev_id, tid, skb_cb->htt.freq); + (u32)skb_cb->paddr, vdev_id, tid, freq); ath10k_dbg_dump(ar, ATH10K_DBG_HTT_DUMP, NULL, "htt tx msdu: ", msdu->data, msdu->len); trace_ath10k_tx_hdr(ar, msdu->data, msdu->len); diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 9c76934b3bf0..ddf2ad2f3955 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -3517,6 +3517,7 @@ void __ath10k_scan_finish(struct ath10k *ar) case ATH10K_SCAN_STARTING: ar->scan.state = ATH10K_SCAN_IDLE; ar->scan_channel = NULL; + ar->scan.roc_freq = 0; ath10k_offchan_tx_purge(ar); cancel_delayed_work(&ar->scan.timeout); complete_all(&ar->scan.completed); @@ -3672,7 +3673,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.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); ATH10K_SKB_CB(skb)->vdev_id = ath10k_tx_h_get_vdev_id(ar, vif); @@ -3697,13 +3697,10 @@ static void ath10k_tx(struct ieee80211_hw *hw, if (info->flags & IEEE80211_TX_CTL_TX_OFFCHAN) { spin_lock_bh(&ar->data_lock); - ATH10K_SKB_CB(skb)->htt.freq = ar->scan.roc_freq; ATH10K_SKB_CB(skb)->vdev_id = ar->scan.vdev_id; spin_unlock_bh(&ar->data_lock); if (ath10k_mac_need_offchan_tx_work(ar)) { - ATH10K_SKB_CB(skb)->htt.freq = 0; - ath10k_dbg(ar, ATH10K_DBG_MAC, "queued offchannel skb %p\n", skb); -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: Michal Kazior <michal.kazior@tieto.com> To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior <michal.kazior@tieto.com> Subject: [PATCH 5/8] ath10k: remove freq from skb_cb Date: Mon, 2 Nov 2015 15:03:05 +0100 [thread overview] Message-ID: <1446472988-2603-6-git-send-email-michal.kazior@tieto.com> (raw) In-Reply-To: <1446472988-2603-1-git-send-email-michal.kazior@tieto.com> It was wasteful to keep it in the struct. Signed-off-by: Michal Kazior <michal.kazior@tieto.com> --- drivers/net/wireless/ath/ath10k/core.h | 1 - drivers/net/wireless/ath/ath10k/htt_tx.c | 9 +++++++-- drivers/net/wireless/ath/ath10k/mac.c | 5 +---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index f24a5feb2220..64a248f780b9 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -88,7 +88,6 @@ struct ath10k_skb_cb { struct { u8 tid; - u16 freq; bool nohwcrypt; struct ath10k_htt_txbuf *txbuf; u32 txbuf_paddr; diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c index bada9695a4fb..05ce99ad6ca2 100644 --- a/drivers/net/wireless/ath/ath10k/htt_tx.c +++ b/drivers/net/wireless/ath/ath10k/htt_tx.c @@ -531,6 +531,7 @@ int ath10k_htt_tx(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txmode, struct ath10k *ar = htt->ar; struct device *dev = ar->dev; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)msdu->data; + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(msdu); struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(msdu); struct ath10k_hif_sg_item sg_items[2]; struct htt_data_tx_desc_frag *frags; @@ -540,6 +541,7 @@ int ath10k_htt_tx(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txmode, int res; u8 flags0 = 0; u16 msdu_id, flags1 = 0; + u16 freq = 0; u32 frags_paddr = 0; struct htt_msdu_ext_desc *ext_desc = NULL; bool limit_mgmt_desc = false; @@ -591,6 +593,9 @@ int ath10k_htt_tx(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txmode, goto err_free_msdu_id; } + if (unlikely(info->flags & IEEE80211_TX_CTL_TX_OFFCHAN)) + freq = ar->scan.roc_freq; + switch (txmode) { case ATH10K_HW_TXRX_RAW: case ATH10K_HW_TXRX_NATIVE_WIFI: @@ -680,13 +685,13 @@ int ath10k_htt_tx(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txmode, skb_cb->htt.txbuf->cmd_tx.id = __cpu_to_le16(msdu_id); skb_cb->htt.txbuf->cmd_tx.frags_paddr = __cpu_to_le32(frags_paddr); skb_cb->htt.txbuf->cmd_tx.peerid = __cpu_to_le16(HTT_INVALID_PEERID); - skb_cb->htt.txbuf->cmd_tx.freq = __cpu_to_le16(skb_cb->htt.freq); + skb_cb->htt.txbuf->cmd_tx.freq = __cpu_to_le16(freq); trace_ath10k_htt_tx(ar, msdu_id, msdu->len, vdev_id, tid); ath10k_dbg(ar, ATH10K_DBG_HTT, "htt tx flags0 %hhu flags1 %hu len %d id %hu frags_paddr %08x, msdu_paddr %08x vdev %hhu tid %hhu freq %hu\n", flags0, flags1, msdu->len, msdu_id, frags_paddr, - (u32)skb_cb->paddr, vdev_id, tid, skb_cb->htt.freq); + (u32)skb_cb->paddr, vdev_id, tid, freq); ath10k_dbg_dump(ar, ATH10K_DBG_HTT_DUMP, NULL, "htt tx msdu: ", msdu->data, msdu->len); trace_ath10k_tx_hdr(ar, msdu->data, msdu->len); diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 9c76934b3bf0..ddf2ad2f3955 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -3517,6 +3517,7 @@ void __ath10k_scan_finish(struct ath10k *ar) case ATH10K_SCAN_STARTING: ar->scan.state = ATH10K_SCAN_IDLE; ar->scan_channel = NULL; + ar->scan.roc_freq = 0; ath10k_offchan_tx_purge(ar); cancel_delayed_work(&ar->scan.timeout); complete_all(&ar->scan.completed); @@ -3672,7 +3673,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.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); ATH10K_SKB_CB(skb)->vdev_id = ath10k_tx_h_get_vdev_id(ar, vif); @@ -3697,13 +3697,10 @@ static void ath10k_tx(struct ieee80211_hw *hw, if (info->flags & IEEE80211_TX_CTL_TX_OFFCHAN) { spin_lock_bh(&ar->data_lock); - ATH10K_SKB_CB(skb)->htt.freq = ar->scan.roc_freq; ATH10K_SKB_CB(skb)->vdev_id = ar->scan.vdev_id; spin_unlock_bh(&ar->data_lock); if (ath10k_mac_need_offchan_tx_work(ar)) { - ATH10K_SKB_CB(skb)->htt.freq = 0; - ath10k_dbg(ar, ATH10K_DBG_MAC, "queued offchannel skb %p\n", skb); -- 2.1.4 _______________________________________________ ath10k mailing list ath10k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath10k
next prev parent reply other threads:[~2015-11-02 14:04 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-11-02 14:03 [PATCH 0/8] ath10k: clean up ath10k_skb_cb Michal Kazior 2015-11-02 14:03 ` Michal Kazior 2015-11-02 14:03 ` [PATCH 1/8] ath10k: merge is_protected with nohwcrypt Michal Kazior 2015-11-02 14:03 ` Michal Kazior 2015-11-02 14:03 ` [PATCH 2/8] ath10k: rename function to adhere to naming convention Michal Kazior 2015-11-02 14:03 ` Michal Kazior 2015-11-02 14:03 ` [PATCH 3/8] ath10k: remove txmode from skb_cb Michal Kazior 2015-11-02 14:03 ` Michal Kazior 2015-11-02 14:03 ` [PATCH 4/8] ath10k: remove is_offchan Michal Kazior 2015-11-02 14:03 ` Michal Kazior 2015-11-02 14:03 ` Michal Kazior [this message] 2015-11-02 14:03 ` [PATCH 5/8] ath10k: remove freq from skb_cb Michal Kazior 2015-11-02 14:03 ` [PATCH 6/8] ath10k: pack up flags in skb_cb Michal Kazior 2015-11-02 14:03 ` Michal Kazior 2015-11-02 14:03 ` [PATCH 7/8] ath10k: replace vdev_id and tid in skb cb Michal Kazior 2015-11-02 14:03 ` Michal Kazior 2015-11-03 9:37 ` Michal Kazior 2015-11-03 9:37 ` Michal Kazior 2015-11-02 14:03 ` [PATCH 8/8] ath10k: store msdu_id instead of txbuf pointers Michal Kazior 2015-11-02 14:03 ` Michal Kazior 2015-11-10 13:10 ` [PATCH v2 0/9] ath10k: clean up ath10k_skb_cb Michal Kazior 2015-11-10 13:10 ` Michal Kazior 2015-11-10 13:10 ` [PATCH v2 1/9] ath10k: merge is_protected with nohwcrypt Michal Kazior 2015-11-10 13:10 ` Michal Kazior 2015-11-10 13:10 ` [PATCH v2 2/9] ath10k: rename function to adhere to naming convention Michal Kazior 2015-11-10 13:10 ` Michal Kazior 2015-11-10 13:10 ` [PATCH v2 3/9] ath10k: remove txmode from skb_cb Michal Kazior 2015-11-10 13:10 ` Michal Kazior 2015-11-10 13:10 ` [PATCH v2 4/9] ath10k: remove is_offchan Michal Kazior 2015-11-10 13:10 ` Michal Kazior 2015-11-10 13:10 ` [PATCH v2 5/9] ath10k: remove freq from skb_cb Michal Kazior 2015-11-10 13:10 ` Michal Kazior 2015-11-10 13:10 ` [PATCH v2 6/9] ath10k: pack up flags in skb_cb Michal Kazior 2015-11-10 13:10 ` Michal Kazior 2015-11-10 13:10 ` [PATCH v2 7/9] ath10k: fix tx header parsing Michal Kazior 2015-11-10 13:10 ` Michal Kazior 2015-11-10 13:10 ` [PATCH v2 8/9] ath10k: replace vdev_id and tid in skb cb Michal Kazior 2015-11-10 13:10 ` Michal Kazior 2015-11-10 13:10 ` [PATCH v2 9/9] ath10k: store msdu_id instead of txbuf pointers Michal Kazior 2015-11-10 13:10 ` Michal Kazior 2015-11-12 19:29 ` [PATCH v2 0/9] ath10k: clean up ath10k_skb_cb Kalle Valo 2015-11-12 19:29 ` Kalle Valo 2015-11-13 6:20 ` Michal Kazior 2015-11-13 6:20 ` Michal Kazior 2015-11-18 5:59 ` [PATCH v3 " Michal Kazior 2015-11-18 5:59 ` Michal Kazior 2015-11-18 5:59 ` [PATCH v3 1/9] ath10k: merge is_protected with nohwcrypt Michal Kazior 2015-11-18 5:59 ` Michal Kazior 2015-11-18 5:59 ` [PATCH v3 2/9] ath10k: rename function to adhere to naming convention Michal Kazior 2015-11-18 5:59 ` Michal Kazior 2015-11-18 5:59 ` [PATCH v3 3/9] ath10k: remove txmode from skb_cb Michal Kazior 2015-11-18 5:59 ` Michal Kazior 2015-11-18 5:59 ` [PATCH v3 4/9] ath10k: remove is_offchan Michal Kazior 2015-11-18 5:59 ` Michal Kazior 2015-11-18 5:59 ` [PATCH v3 5/9] ath10k: remove freq from skb_cb Michal Kazior 2015-11-18 5:59 ` Michal Kazior 2015-11-18 5:59 ` [PATCH v3 6/9] ath10k: pack up flags in skb_cb Michal Kazior 2015-11-18 5:59 ` Michal Kazior 2015-11-18 5:59 ` [PATCH v3 7/9] ath10k: fix tx header parsing Michal Kazior 2015-11-18 5:59 ` Michal Kazior 2015-11-18 5:59 ` [PATCH v3 8/9] ath10k: replace vdev_id and tid in skb cb Michal Kazior 2015-11-18 5:59 ` Michal Kazior 2015-11-18 5:59 ` [PATCH v3 9/9] ath10k: store msdu_id instead of txbuf pointers Michal Kazior 2015-11-18 5:59 ` Michal Kazior 2015-11-19 15:10 ` QCA998X not working at all Sebastian Gottschall 2015-11-19 15:33 ` Ben Greear 2015-11-19 15:35 ` Sebastian Gottschall 2015-11-19 16:13 ` Ben Greear 2015-11-19 17:12 ` Sebastian Gottschall 2015-11-19 18:21 ` Sebastian Gottschall 2015-11-20 11:53 ` Kalle Valo 2015-11-20 15:55 ` Sebastian Gottschall 2015-11-20 16:46 ` Ben Greear 2016-04-13 15:36 ` Ben Greear 2016-04-13 17:05 ` Alexis Green 2016-04-14 14:13 ` Sebastian Gottschall 2016-04-14 14:12 ` Sebastian Gottschall 2015-11-19 15:35 ` Sebastian Gottschall 2015-11-23 15:21 ` [PATCH v3 0/9] ath10k: clean up ath10k_skb_cb Kalle Valo 2015-11-23 15:21 ` Kalle Valo
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1446472988-2603-6-git-send-email-michal.kazior@tieto.com \ --to=michal.kazior@tieto.com \ --cc=ath10k@lists.infradead.org \ --cc=linux-wireless@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.