wifi: ath10k: Use IEEE80211_SEQ_TO_SN() for seq_ctrl conversion
authorZhi-Jun You <hujy652@gmail.com>
Sun, 6 Nov 2022 16:22:27 +0000 (00:22 +0800)
committerKalle Valo <quic_kvalo@quicinc.com>
Wed, 9 Nov 2022 07:05:42 +0000 (09:05 +0200)
Use IEEE80211_SEQ_TO_SN() macro to convert seq_ctrl to sn for better
readability.

Signed-off-by: Zhi-Jun You <hujy652@gmail.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20221106162227.1119-1-hujy652@gmail.com
drivers/net/wireless/ath/ath10k/htt_rx.c

index e76aab9..3df5290 100644 (file)
@@ -1379,7 +1379,7 @@ static void ath10k_process_rx(struct ath10k *ar, struct sk_buff *skb)
                   ath10k_get_tid(hdr, tid, sizeof(tid)),
                   is_multicast_ether_addr(ieee80211_get_DA(hdr)) ?
                                                        "mcast" : "ucast",
-                  (__le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_SEQ) >> 4,
+                  IEEE80211_SEQ_TO_SN(__le16_to_cpu(hdr->seq_ctrl)),
                   (status->encoding == RX_ENC_LEGACY) ? "legacy" : "",
                   (status->encoding == RX_ENC_HT) ? "ht" : "",
                   (status->encoding == RX_ENC_VHT) ? "vht" : "",
@@ -1902,7 +1902,7 @@ static bool ath10k_htt_rx_h_frag_pn_check(struct ath10k *ar,
        last_pn = &peer->frag_tids_last_pn[tid];
        new_pn.pn48 = ath10k_htt_rx_h_get_pn(ar, skb, offset, enctype);
        frag_number = le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG;
-       seq = (__le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_SEQ) >> 4;
+       seq = IEEE80211_SEQ_TO_SN(__le16_to_cpu(hdr->seq_ctrl));
 
        if (frag_number == 0) {
                last_pn->pn48 = new_pn.pn48;
@@ -2824,7 +2824,7 @@ static bool ath10k_htt_rx_proc_rx_frag_ind_hl(struct ath10k_htt *htt,
 
        hdr_space = ieee80211_hdrlen(hdr->frame_control);
        sc = __le16_to_cpu(hdr->seq_ctrl);
-       seq = (sc & IEEE80211_SCTL_SEQ) >> 4;
+       seq = IEEE80211_SEQ_TO_SN(sc);
        frag = sc & IEEE80211_SCTL_FRAG;
 
        sec_index = MS(rx_desc_info, HTT_RX_DESC_HL_INFO_MCAST_BCAST) ?