From nobody Thu Apr 9 13:41:53 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A7DAC433FE for ; Sun, 6 Nov 2022 12:49:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229989AbiKFMtW (ORCPT ); Sun, 6 Nov 2022 07:49:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229959AbiKFMtQ (ORCPT ); Sun, 6 Nov 2022 07:49:16 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA1AD647E for ; Sun, 6 Nov 2022 04:49:15 -0800 (PST) Received: from ipservice-092-217-068-220.092.217.pools.vodafone-ip.de ([92.217.68.220] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1orf5K-0008Dj-HH; Sun, 06 Nov 2022 13:49:10 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 3/9] staging: r8188eu: reorder assignments, clarify the header format Date: Sun, 6 Nov 2022 13:48:55 +0100 Message-Id: <20221106124901.720785-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221106124901.720785-1-martin@kaiser.cx> References: <20221106124901.720785-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 --- drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_rxdesc.c index 9a61eef8550b..d1ac2960f1c4 100644 --- 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 *pre= cvframe, struct recv_stat =20 if (pattrib->pkt_rpt_type =3D=3D NORMAL_RX) { pattrib->pkt_len =3D le32_to_cpu(prxstat->rxdw0) & 0x00003fff; + pattrib->icv_err =3D (le32_to_cpu(prxstat->rxdw0) >> 15) & 0x1; pattrib->drvinfo_sz =3D ((le32_to_cpu(prxstat->rxdw0) >> 16) & 0xf) * 8; - + pattrib->encrypt =3D (u8)((le32_to_cpu(prxstat->rxdw0) >> 20) & 0x7); + pattrib->qos =3D (le32_to_cpu(prxstat->rxdw0) >> 23) & 0x1; + pattrib->shift_sz =3D (le32_to_cpu(prxstat->rxdw0) >> 24) & 0x3; pattrib->physt =3D (le32_to_cpu(prxstat->rxdw0) >> 26) & 0x1; - pattrib->bdecrypted =3D (le32_to_cpu(prxstat->rxdw0) & BIT(27)) ? 0 : 1; - pattrib->encrypt =3D (le32_to_cpu(prxstat->rxdw0) >> 20) & 0x7; =20 - pattrib->qos =3D (le32_to_cpu(prxstat->rxdw0) >> 23) & 0x1; pattrib->priority =3D (le32_to_cpu(prxstat->rxdw1) >> 8) & 0xf; - pattrib->amsdu =3D (le32_to_cpu(prxstat->rxdw1) >> 13) & 0x1; + pattrib->mdata =3D (le32_to_cpu(prxstat->rxdw1) >> 26) & 0x1; + pattrib->mfrag =3D (le32_to_cpu(prxstat->rxdw1) >> 27) & 0x1; =20 pattrib->seq_num =3D le32_to_cpu(prxstat->rxdw2) & 0x00000fff; pattrib->frag_num =3D (le32_to_cpu(prxstat->rxdw2) >> 12) & 0xf; - pattrib->mfrag =3D (le32_to_cpu(prxstat->rxdw1) >> 27) & 0x1; - pattrib->mdata =3D (le32_to_cpu(prxstat->rxdw1) >> 26) & 0x1; =20 pattrib->mcs_rate =3D le32_to_cpu(prxstat->rxdw3) & 0x3f; pattrib->rxht =3D (le32_to_cpu(prxstat->rxdw3) >> 6) & 0x1; =20 - pattrib->icv_err =3D (le32_to_cpu(prxstat->rxdw0) >> 15) & 0x1; - pattrib->shift_sz =3D (le32_to_cpu(prxstat->rxdw0) >> 24) & 0x3; } else if (pattrib->pkt_rpt_type =3D=3D TX_REPORT1) { /* CCX */ pattrib->pkt_len =3D TX_RPT1_PKT_LEN; } else if (pattrib->pkt_rpt_type =3D=3D TX_REPORT2) { --=20 2.30.2