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 v2 1/9] ath10k: merge is_protected with nohwcrypt Date: Tue, 10 Nov 2015 14:10:47 +0100 [thread overview] Message-ID: <1447161055-2283-2-git-send-email-michal.kazior@tieto.com> (raw) In-Reply-To: <1447161055-2283-1-git-send-email-michal.kazior@tieto.com> It was wasteful to have two flags describing the same thing. While at it fix code style of ath10k_tx_h_use_hwcrypto(). 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 | 3 --- drivers/net/wireless/ath/ath10k/mac.c | 14 ++++++++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index c16f3484dc8a..48db7dd36164 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -86,7 +86,6 @@ struct ath10k_skb_cb { u8 eid; u8 vdev_id; enum ath10k_hw_txrx_mode txmode; - bool is_protected; struct { u8 tid; diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c index bd8f264ed8cd..31c172848d10 100644 --- a/drivers/net/wireless/ath/ath10k/htt_tx.c +++ b/drivers/net/wireless/ath/ath10k/htt_tx.c @@ -663,9 +663,6 @@ int ath10k_htt_tx(struct ath10k_htt *htt, struct sk_buff *msdu) if (skb_cb->htt.nohwcrypt) flags0 |= HTT_DATA_TX_DESC_FLAGS0_NO_ENCRYPT; - if (!skb_cb->is_protected) - flags0 |= HTT_DATA_TX_DESC_FLAGS0_NO_ENCRYPT; - flags1 |= SM((u16)vdev_id, HTT_DATA_TX_DESC_FLAGS1_VDEV_ID); flags1 |= SM((u16)tid, HTT_DATA_TX_DESC_FLAGS1_EXT_TID); if (msdu->ip_summed == CHECKSUM_PARTIAL && diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index a53e213387a2..2eb647913a9f 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -3197,14 +3197,22 @@ ath10k_tx_h_get_txmode(struct ath10k *ar, struct ieee80211_vif *vif, } static bool ath10k_tx_h_use_hwcrypto(struct ieee80211_vif *vif, - struct sk_buff *skb) { - struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); + struct sk_buff *skb) +{ + const struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); + const struct ieee80211_hdr *hdr = (void *)skb->data; const u32 mask = IEEE80211_TX_INTFL_DONT_ENCRYPT | IEEE80211_TX_CTL_INJECTED; + + if (!ieee80211_has_protected(hdr->frame_control)) + return false; + if ((info->flags & mask) == mask) return false; + if (vif) return !ath10k_vif_to_arvif(vif)->nohwcrypt; + return true; } @@ -3642,7 +3650,6 @@ static void ath10k_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif = info->control.vif; struct ieee80211_sta *sta = control->sta; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; - __le16 fc = hdr->frame_control; /* We should disable CCK RATE due to P2P */ if (info->flags & IEEE80211_TX_CTL_NO_CCK_RATE) @@ -3654,7 +3661,6 @@ static void ath10k_tx(struct ieee80211_hw *hw, 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); ATH10K_SKB_CB(skb)->txmode = ath10k_tx_h_get_txmode(ar, vif, sta, skb); - ATH10K_SKB_CB(skb)->is_protected = ieee80211_has_protected(fc); switch (ATH10K_SKB_CB(skb)->txmode) { case ATH10K_HW_TXRX_MGMT: -- 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 v2 1/9] ath10k: merge is_protected with nohwcrypt Date: Tue, 10 Nov 2015 14:10:47 +0100 [thread overview] Message-ID: <1447161055-2283-2-git-send-email-michal.kazior@tieto.com> (raw) In-Reply-To: <1447161055-2283-1-git-send-email-michal.kazior@tieto.com> It was wasteful to have two flags describing the same thing. While at it fix code style of ath10k_tx_h_use_hwcrypto(). 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 | 3 --- drivers/net/wireless/ath/ath10k/mac.c | 14 ++++++++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index c16f3484dc8a..48db7dd36164 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -86,7 +86,6 @@ struct ath10k_skb_cb { u8 eid; u8 vdev_id; enum ath10k_hw_txrx_mode txmode; - bool is_protected; struct { u8 tid; diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c index bd8f264ed8cd..31c172848d10 100644 --- a/drivers/net/wireless/ath/ath10k/htt_tx.c +++ b/drivers/net/wireless/ath/ath10k/htt_tx.c @@ -663,9 +663,6 @@ int ath10k_htt_tx(struct ath10k_htt *htt, struct sk_buff *msdu) if (skb_cb->htt.nohwcrypt) flags0 |= HTT_DATA_TX_DESC_FLAGS0_NO_ENCRYPT; - if (!skb_cb->is_protected) - flags0 |= HTT_DATA_TX_DESC_FLAGS0_NO_ENCRYPT; - flags1 |= SM((u16)vdev_id, HTT_DATA_TX_DESC_FLAGS1_VDEV_ID); flags1 |= SM((u16)tid, HTT_DATA_TX_DESC_FLAGS1_EXT_TID); if (msdu->ip_summed == CHECKSUM_PARTIAL && diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index a53e213387a2..2eb647913a9f 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -3197,14 +3197,22 @@ ath10k_tx_h_get_txmode(struct ath10k *ar, struct ieee80211_vif *vif, } static bool ath10k_tx_h_use_hwcrypto(struct ieee80211_vif *vif, - struct sk_buff *skb) { - struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); + struct sk_buff *skb) +{ + const struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); + const struct ieee80211_hdr *hdr = (void *)skb->data; const u32 mask = IEEE80211_TX_INTFL_DONT_ENCRYPT | IEEE80211_TX_CTL_INJECTED; + + if (!ieee80211_has_protected(hdr->frame_control)) + return false; + if ((info->flags & mask) == mask) return false; + if (vif) return !ath10k_vif_to_arvif(vif)->nohwcrypt; + return true; } @@ -3642,7 +3650,6 @@ static void ath10k_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif = info->control.vif; struct ieee80211_sta *sta = control->sta; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; - __le16 fc = hdr->frame_control; /* We should disable CCK RATE due to P2P */ if (info->flags & IEEE80211_TX_CTL_NO_CCK_RATE) @@ -3654,7 +3661,6 @@ static void ath10k_tx(struct ieee80211_hw *hw, 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); ATH10K_SKB_CB(skb)->txmode = ath10k_tx_h_get_txmode(ar, vif, sta, skb); - ATH10K_SKB_CB(skb)->is_protected = ieee80211_has_protected(fc); switch (ATH10K_SKB_CB(skb)->txmode) { case ATH10K_HW_TXRX_MGMT: -- 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-10 13:13 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 ` [PATCH 5/8] ath10k: remove freq from skb_cb Michal Kazior 2015-11-02 14:03 ` 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 ` Michal Kazior [this message] 2015-11-10 13:10 ` [PATCH v2 1/9] ath10k: merge is_protected with nohwcrypt 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=1447161055-2283-2-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.