staging: r8188eu: reorder assignments, clarify the header format

Reorder some of the assignments in update_recvframe_attrib_88e.

This should make it a bit easier to understand the format of the header
that is added by the chip's firmware.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Link: https://lore.kernel.org/r/20221106124901.720785-4-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c b/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c
index 9a61eef8550bd17c1480c37cc45a7aa138b04449..d1ac2960f1c444d23cff38fe88eb9397446ae63d 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c
@@ -66,28 +66,25 @@ void update_recvframe_attrib_88e(struct recv_frame *precvframe, struct recv_stat
 
        if (pattrib->pkt_rpt_type == NORMAL_RX) {
                pattrib->pkt_len = le32_to_cpu(prxstat->rxdw0) & 0x00003fff;
+               pattrib->icv_err = (le32_to_cpu(prxstat->rxdw0) >> 15) & 0x1;
                pattrib->drvinfo_sz = ((le32_to_cpu(prxstat->rxdw0) >> 16) & 0xf) * 8;
-
+               pattrib->encrypt = (u8)((le32_to_cpu(prxstat->rxdw0) >> 20) & 0x7);
+               pattrib->qos = (le32_to_cpu(prxstat->rxdw0) >> 23) & 0x1;
+               pattrib->shift_sz = (le32_to_cpu(prxstat->rxdw0) >> 24) & 0x3;
                pattrib->physt = (le32_to_cpu(prxstat->rxdw0) >> 26) & 0x1;
-
                pattrib->bdecrypted = (le32_to_cpu(prxstat->rxdw0) & BIT(27)) ? 0 : 1;
-               pattrib->encrypt = (le32_to_cpu(prxstat->rxdw0) >> 20) & 0x7;
 
-               pattrib->qos = (le32_to_cpu(prxstat->rxdw0) >> 23) & 0x1;
                pattrib->priority = (le32_to_cpu(prxstat->rxdw1) >> 8) & 0xf;
-
                pattrib->amsdu = (le32_to_cpu(prxstat->rxdw1) >> 13) & 0x1;
+               pattrib->mdata = (le32_to_cpu(prxstat->rxdw1) >> 26) & 0x1;
+               pattrib->mfrag = (le32_to_cpu(prxstat->rxdw1) >> 27) & 0x1;
 
                pattrib->seq_num = le32_to_cpu(prxstat->rxdw2) & 0x00000fff;
                pattrib->frag_num = (le32_to_cpu(prxstat->rxdw2) >> 12) & 0xf;
-               pattrib->mfrag = (le32_to_cpu(prxstat->rxdw1) >> 27) & 0x1;
-               pattrib->mdata = (le32_to_cpu(prxstat->rxdw1) >> 26) & 0x1;
 
                pattrib->mcs_rate = le32_to_cpu(prxstat->rxdw3) & 0x3f;
                pattrib->rxht = (le32_to_cpu(prxstat->rxdw3) >> 6) & 0x1;
 
-               pattrib->icv_err = (le32_to_cpu(prxstat->rxdw0) >> 15) & 0x1;
-               pattrib->shift_sz = (le32_to_cpu(prxstat->rxdw0) >> 24) & 0x3;
        } else if (pattrib->pkt_rpt_type == TX_REPORT1) { /* CCX */
                pattrib->pkt_len = TX_RPT1_PKT_LEN;
        } else if (pattrib->pkt_rpt_type == TX_REPORT2) {