From nobody Tue Apr 29 04:07:56 2025
Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com
[209.85.208.48])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7F9B01990D8
for <linux-kernel@vger.kernel.org>; Fri, 4 Apr 2025 08:51:32 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=209.85.208.48
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1743756694; cv=none;
b=FfuVXx692tW7GDl6/gyz0LIPJwAIdnVzGTKRc6JiJqIbFGnH4GWKlONImAqfSsKXFd98P2Tc7/tjM30bJKevxwMXDceuGJ5xF6RO5hsaBBqdGmnCRe6eDwtOkR6pKnfkcS+09/BU5NymYdp85NAY1OHkImPEyyeb48E3cdTGCOQ=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1743756694; c=relaxed/simple;
bh=zEAYc6CUru9160TwzSAfQDtqLP2BDdJuSBYJBKA88TY=;
h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:
MIME-Version;
b=HYPwjrBSgWeg3PwJFR1KUqQ1mUBLO0PnkPwGvQsat/5LhwmN6aymEK5wyBgr4MrooOURoQTdPYbTNN71PRZ/HTD5WkfSNAeL8ayadhqGQnefQ2taa2w6A/9bgg1guv0agENbHVVP/2leAEpXfSOmcvaMGocmKxYmC4iDTT0REjY=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=gmail.com;
spf=pass smtp.mailfrom=gmail.com;
dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com
header.b=Uyt+1d5Q; arc=none smtp.client-ip=209.85.208.48
Authentication-Results: smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=gmail.com
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=gmail.com
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com
header.b="Uyt+1d5Q"
Received: by mail-ed1-f48.google.com with SMTP id
4fb4d7f45d1cf-5e6167d0536so3204908a12.1
for <linux-kernel@vger.kernel.org>;
Fri, 04 Apr 2025 01:51:32 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1743756691; x=1744361491;
darn=vger.kernel.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=ez4cJVuEZuHb/3XDGnXvrUc45BD7UNtT/aBP82N7MgE=;
b=Uyt+1d5QE+RHniUqrnZujLoWvsfmjCcaD1emYeRkZDTJnmqTShxN9PZxK5pJHsi/dS
VldcCPAqW2mTw2tYM/b28Psi2Dp6Aco4uBJkAz+7M3qkPz4+h4FlMXFXrhTIXjk+stK+
+WBreKdJZ6pgezuTpvBt0hB8kbHcD0HTMrLINALZx3Y+Gs0EPLHaM2NT9SX8N+UEY+T2
nC6yEbDaksChTo7/QSWsuTVdyyMr8A5v+nI/SUIR1yHJWoac/1NWbuRnOZVbI0kOAMVm
/Qg91mq6jIfx9qOPoGwbVMTIXJnT49zIe6oKY1O7WdHnFYbkLdg9AxC/5/TCLraMdjM1
8byQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1743756691; x=1744361491;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=ez4cJVuEZuHb/3XDGnXvrUc45BD7UNtT/aBP82N7MgE=;
b=CY+45vUVnB9qOPLBoS03zP9qSgxiXMGjkslK0PAo0WXIAk4vGncFc67zFShPg2WHvW
zTLh0NfMo253nkXG7g5tu6aVySCfZP+V7jT4CcMcwFCXDLM4sU6Qu9y/Dq7bT+qfpTTB
ZDYpV6uvjjgqi2Z8k6BWCJhe4sVArhFQelUvWuv4arATNy8mnTd+fpWDM+VtWQEZJr8v
NRXzi2UbbFiqiceVMxzRrLECiglDppCHduihe91lPQuH/4TZ1r3XYPDYdwjbuUWRAFyF
WOXgtW+uaATl7DlbZybGNYKwiWa1ukmiGYQVg+AF5h24QL2xW9ubW/iII1mrEe97Zn6e
qEIg==
X-Forwarded-Encrypted: i=1;
AJvYcCWxa5mj4M5t2Eg7sILVmTdivduYYdkuGJZBFz4pHKzQ6G1mv4Lnmk2ztG9swfchafKQaERBQPg7ke+a9lE=@vger.kernel.org
X-Gm-Message-State: AOJu0Yzalwzl2qumhjnWd2bSPNpNqtxwaY3KSRZgUsY3ScxBmDOi6oLw
4IjbjJDSQX0ejnx2BsAZKyexFggFUCazZs34TbU4gewpdZ8VMWms
X-Gm-Gg: ASbGncvVlagRYTCC9aUn+xQWv0FG42/VjLEStU1Ne693kSt6F77zMBDLet97Axm4945
77SnC/CHPjJ6/dRxLHTS4/NfYLe2qxc5ExY7yFwt8qjEcg/NqXBfG/8xT3Gzx1SEL2SUu8vvF2m
3f2Ez70vsINcHF6gh7OL/Na2RmMFzAeadSuLQ/s18awFUUU/ul6buAXThWNsiylXoSlHzrXNgcD
f4c4gs+CSoqLCJ2tjQZ2bgbn6DZWh3hq8B60ZD5O0bwRoos6+J16f1FDXncEwXL87ShuZUEXA4V
9r9pGaK/OC/+PhfftloUknVJIgYzLsflPYqnaRTFUaCsFQnU
X-Google-Smtp-Source:
AGHT+IGUtrs7aTeX3HSO70dnd3bxe+iIXgEVPYaAB49NmSVLfuqhqySvhJDzCvnXs4FV15RvyNLNzg==
X-Received: by 2002:a05:6402:2811:b0:5e5:e836:71f3 with SMTP id
4fb4d7f45d1cf-5f0b4702134mr1805964a12.29.1743756690391;
Fri, 04 Apr 2025 01:51:30 -0700 (PDT)
Received: from HP-650 ([105.112.123.50])
by smtp.gmail.com with ESMTPSA id
4fb4d7f45d1cf-5f088084eecsm1954680a12.57.2025.04.04.01.51.28
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 04 Apr 2025 01:51:30 -0700 (PDT)
From: Abraham Samuel Adekunle <abrahamadekunle50@gmail.com>
To: outreachy@lists.linux.dev,
julia.lawall@inria.fr
Cc: gregkh@linuxfoundation.org,
linux-staging@lists.linux.dev,
linux-kernel@vger.kernel.org,
andy@kernel.org,
Abraham Samuel Adekunle <abrahamadekunle50@gmail.com>
Subject: [PATCH v4 1/1] staging: rtl8723bs: Prevent duplicate NULL tests on a
value
Date: Fri, 4 Apr 2025 09:50:21 +0100
Message-Id:
<6852a0c603010345d646a9d1bba06631ee5c5cbd.1743755621.git.abrahamadekunle50@gmail.com>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <cover.1743755621.git.abrahamadekunle50@gmail.com>
References: <cover.1743755621.git.abrahamadekunle50@gmail.com>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="utf-8"
When a value has been tested for NULL in an expression, a
second NULL test on the same value in another expression
is unnecessary when the value has not been assigned NULL.
Remove unnecessary duplicate NULL tests on the same value that
has previously been NULL tested.
While at it, convert '& 0xfff' cases to use modulo operator and
decimal number to make the upper limit visible and clear what the
semantic of it is.
Found by Coccinelle.
Signed-off-by: Abraham Samuel Adekunle <abrahamadekunle50@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +-
drivers/staging/rtl8723bs/core/rtw_xmit.c | 58 +++++++++----------
2 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin=
g/rtl8723bs/core/rtw_mlme_ext.c
index 90966b7034ab..675226535cd1 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -1323,7 +1323,7 @@ unsigned int OnAssocReq(struct adapter *padapter, uni=
on recv_frame *precv_frame)
spin_unlock_bh(&pstapriv->asoc_list_lock);
=20
/* now the station is qualified to join our BSS... */
- if (pstat && (pstat->state & WIFI_FW_ASSOC_SUCCESS) && (status =3D=3D WLA=
N_STATUS_SUCCESS)) {
+ if ((pstat->state & WIFI_FW_ASSOC_SUCCESS) && (status =3D=3D WLAN_STATUS_=
SUCCESS)) {
/* 1 bss_cap_update & sta_info_update */
bss_cap_update_on_sta_join(padapter, pstat);
sta_info_update(padapter, pstat);
diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rt=
l8723bs/core/rtw_xmit.c
index 026061b464f7..bb806f00f931 100644
--- a/drivers/staging/rtl8723bs/core/rtw_xmit.c
+++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c
@@ -941,35 +941,35 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hd=
r, struct pkt_attrib *pattr
if (!(psta->state & _FW_LINKED))
return _FAIL;
=20
- if (psta) {
- psta->sta_xmitpriv.txseq_tid[pattrib->priority]++;
- psta->sta_xmitpriv.txseq_tid[pattrib->priority] &=3D 0xFFF;
- pattrib->seqnum =3D psta->sta_xmitpriv.txseq_tid[pattrib->priority];
-
- SetSeqNum(hdr, pattrib->seqnum);
-
- /* check if enable ampdu */
- if (pattrib->ht_en && psta->htpriv.ampdu_enable)
- if (psta->htpriv.agg_enable_bitmap & BIT(pattrib->priority))
- pattrib->ampdu_en =3D true;
-
- /* re-check if enable ampdu by BA_starting_seqctrl */
- if (pattrib->ampdu_en =3D=3D true) {
- u16 tx_seq;
-
- tx_seq =3D psta->BA_starting_seqctrl[pattrib->priority & 0x0f];
-
- /* check BA_starting_seqctrl */
- if (SN_LESS(pattrib->seqnum, tx_seq)) {
- pattrib->ampdu_en =3D false;/* AGG BK */
- } else if (SN_EQUAL(pattrib->seqnum, tx_seq)) {
- psta->BA_starting_seqctrl[pattrib->priority & 0x0f] =3D (tx_seq+1)&0=
xfff;
-
- pattrib->ampdu_en =3D true;/* AGG EN */
- } else {
- psta->BA_starting_seqctrl[pattrib->priority & 0x0f] =3D (pattrib->se=
qnum+1)&0xfff;
- pattrib->ampdu_en =3D true;/* AGG EN */
- }
+ psta->sta_xmitpriv.txseq_tid[pattrib->priority]++;
+ psta->sta_xmitpriv.txseq_tid[pattrib->priority] &=3D 0xFFF;
+ pattrib->seqnum =3D psta->sta_xmitpriv.txseq_tid[pattrib->priority];
+
+ SetSeqNum(hdr, pattrib->seqnum);
+
+ /* check if enable ampdu */
+ if (pattrib->ht_en && psta->htpriv.ampdu_enable)
+ if (psta->htpriv.agg_enable_bitmap & BIT(pattrib->priority))
+ pattrib->ampdu_en =3D true;
+
+ /* re-check if enable ampdu by BA_starting_seqctrl */
+ if (pattrib->ampdu_en =3D=3D true) {
+ u16 tx_seq;
+
+ tx_seq =3D psta->BA_starting_seqctrl[pattrib->priority & 0x0f];
+
+ /* check BA_starting_seqctrl */
+ if (SN_LESS(pattrib->seqnum, tx_seq)) {
+ pattrib->ampdu_en =3D false;/* AGG BK */
+ } else if (SN_EQUAL(pattrib->seqnum, tx_seq)) {
+ psta->BA_starting_seqctrl[pattrib->priority & 0x0f] =3D
+ (tx_seq + 1) % 4096;
+
+ pattrib->ampdu_en =3D true;/* AGG EN */
+ } else {
+ psta->BA_starting_seqctrl[pattrib->priority & 0x0f] =3D
+ (pattrib->seqnum + 1) % 4096;
+ pattrib->ampdu_en =3D true;/* AGG EN */
}
}
}
--=20
2.34.1