ath10k: merge is_protected with nohwcrypt

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>
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 91a39878c873fd885fb4c7795aabc10aa625f260..73737ea06ccdda0ec2cafe89358aa5fc59340518 100644 (file)
--- 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 8f76b9d9648694d0c5d71e10213fcc26704cf3d1..b57335d47c78ecb853e4638fecd57e28b3de3cce 100644 (file)
--- 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 66378544f3c924bb9d8d4b50425c38d7b8bc8c38..50d6e599ad70f84518ca1e6bf185fb44cd3ce97c 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -3200,14 +3200,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;
 }
 
@@ -3646,7 +3654,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)
@@ -3658,7 +3665,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: