From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (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 840242144CC for ; Fri, 18 Apr 2025 15:42:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744990955; cv=none; b=E8ssDpGiMBef+2vKOyXn6p3Op/1tRLfJ5+ZXNfK0//P0v21y8c1vfgfvGiz89+uNBD6AFzscxhQBl5n/dV98F+N/pIo6wlWXlXPsRlM2vVQpL4jK7SqgSYg/TSwaf8MjwFFngLxfbobBzKI+blzYHWgXTuVoP/xNvcthfGoAPX0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744990955; c=relaxed/simple; bh=XN+T+IkvJggXj9Swo5iUj1qdDIdgJXo1aU/u1V5AHVM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=G+VAx20EJ5XvyNkS/9+AQ+s8RSVoYe0Z5qnfKm81arq/tgyW2310mXCu0s7wfj0uxPGRgxIAdQM3cAizaGI+CefCyNIVRX7F0zjVWv0yLz7vv42Ufr1u/gFmBd4rkrA+2YAyw0ssGxWIAPNdaivuCtuXIVntPvGX1UkVyIJ0TL0= 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=Vp3ZfZeF; arc=none smtp.client-ip=209.85.221.53 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="Vp3ZfZeF" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-3912fdddf8fso2062751f8f.1 for ; Fri, 18 Apr 2025 08:42:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744990952; x=1745595752; 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=htSaQaI4/FFCqvjkgCzgCrUNDaBh6027eu+lTuEGohA=; b=Vp3ZfZeFzdyt3eg9MzrU3VK+JpNubCeXUpgAXyWSwk87+MvuvDywnnNenjXGaWEhjt dDC+vZdLD+lJF4WZzU+eA8iTgB96ZCpnq9U3dBZgVImpJNZYx3bpyJkFvlCx6iYi3U3O LiizKVPF9AjYhf+qAfe37Y22F52lioRjC+Qs/BWTFJJbsksVY2/66iEmC17mWNf1ArWB Q/Gzj/LwN47+L/CTPZiKyjFDBqLVjVrp0nS7cc7Pgz2SyW8vNIOzuBG1r/sGdUc69tVv c06IgCN57C7QB8f8LwnCjovC5rvvRNkPwKG7TdiU/IFEJr3bs/Ofm440uWTG4lX+5tJJ shoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744990952; x=1745595752; 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=htSaQaI4/FFCqvjkgCzgCrUNDaBh6027eu+lTuEGohA=; b=DNVgQXc44dah+wi3jDsCzUasCv7l8GYzsWBFfY7mBcvDLgA42BTCIgA8/7XvUMg+xg SnVE8I/lAIM7mJ16cvvi03DCfNaQ8gvorR8tyKbADH4UMZvC6iHO23G6893gwIm7tkyS I3RFfhRrlMa67TJ6NuOK8omQ0v432o/cEWYyhxYh/RyWUNPsPmB2e3kJH/ZEEyc4XN17 R5RCTACSLMNAmi7sQIjA+9qOl/iSsosWtAfxRjRrUZbW0gxbKUlyoKgRJ7mCGARl6m2U u5JCOab8pmqAU8qUs6YjigeszApg1L5/x3w4YwmoVwRccos3Wb3gNOMYxX1VdJeZ1yyi YXvw== X-Gm-Message-State: AOJu0YzOzI0HBB/ix6YS5DaMoxmJXzDaKyZGHBvG6RZG7AUVCZBFTQNP bxGEzUU7bvasuUeBFdxGeaWBkh+igQRGNZqK+e6PIShXC+1CgisVfIRpHl7KxYQ= X-Gm-Gg: ASbGncvn8CRn0b+Xui5E2MCEYjKlueuEzRoXYwAiSUgbuIVXBqbPCZhdW0y4lSJeftD gxdzUgrPPZ9Aq7/MPXtWV2XF/BuxiLxfn9zy7dJbrihtnh9YlOUPUXbeQEj1kGn/RFrNjqYu4Qi OUhOWOEqkJKA8GAq5czjRjqKDtUDkZ/RUsTKxciSK3a0lkDAtaOq8luRQIkzChfjJK/VToQQVh8 gzekrIjJ7NKUf4BJPfQ/VFycyDdNvq3EldjSMv2bq7CMyKidlE5Sg5EzR80O33oVm+QhX05hiDc RMaW+bB9HRf27trXaE5Zo/BIqLUfK/IQKHUBiQ== X-Google-Smtp-Source: AGHT+IETyRTaWZw7ZEo4TVrhWkWANh2w+Mm+nar+iKlLayes4bAJB8t7DodCE4kIrI3378ClobRYKQ== X-Received: by 2002:a05:6000:2582:b0:39d:8e61:b6eb with SMTP id ffacd0b85a97d-39ef89b5f2bmr3570563f8f.1.1744990951674; Fri, 18 Apr 2025 08:42:31 -0700 (PDT) Received: from ubuntu ([102.88.77.14]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4406d5bbd5fsm26850155e9.22.2025.04.18.08.42.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Apr 2025 08:42:31 -0700 (PDT) From: Abraham Samuel Adekunle To: julia.lawall@inria.fr, gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, dan.carpenter@linaro.org, andy@kernel.org, Abraham Samuel Adekunle Subject: [PATCH v6 2/2] staging: rtl8723bs: Prevent duplicate NULL tests on psta pointer Date: Fri, 18 Apr 2025 15:41:57 +0000 Message-Id: <4fb8314f1ca4c273a1f2c2f648c7993d7708224c.1744990405.git.abrahamadekunle50@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The psta pointer had previously been tested for NULL after initialization, as seen in the code below: psta = rtw_get_stainfo(&padapter->stapriv, pattrib->ra); ... if (!psta) return _FAIL; This makes a second NULL test on psta unnecessary. Remove the second NULL test on psta to avoid redundancy in code. Found by Cocinelle Signed-off-by: Abraham Samuel Adekunle Reviewed-by: Dan Carpenter --- drivers/staging/rtl8723bs/core/rtw_xmit.c | 62 +++++++++++------------ 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c index 026d58b4bd7f..e933ccda1b39 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -941,38 +941,36 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr if (!(psta->state & _FW_LINKED)) return _FAIL; - if (psta) { - psta->sta_xmitpriv.txseq_tid[pattrib->priority]++; - psta->sta_xmitpriv.txseq_tid[pattrib->priority] %= 4096u; - pattrib->seqnum = 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 = true; - - /* re-check if enable ampdu by BA_starting_seqctrl */ - if (pattrib->ampdu_en == true) { - u16 tx_seq; - - tx_seq = psta->BA_starting_seqctrl[pattrib->priority & 0x0f]; - - /* check BA_starting_seqctrl */ - if (SN_LESS(pattrib->seqnum, tx_seq)) { - pattrib->ampdu_en = false;/* AGG BK */ - } else if (SN_EQUAL(pattrib->seqnum, tx_seq)) { - psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = - (tx_seq + 1) % 4096u; - - pattrib->ampdu_en = true;/* AGG EN */ - } else { - psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = - (pattrib->seqnum + 1) % 4096u; - - pattrib->ampdu_en = true;/* AGG EN */ - } + psta->sta_xmitpriv.txseq_tid[pattrib->priority]++; + psta->sta_xmitpriv.txseq_tid[pattrib->priority] %= 4096u; + pattrib->seqnum = 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 = true; + + /* re-check if enable ampdu by BA_starting_seqctrl */ + if (pattrib->ampdu_en == true) { + u16 tx_seq; + + tx_seq = psta->BA_starting_seqctrl[pattrib->priority & 0x0f]; + + /* check BA_starting_seqctrl */ + if (SN_LESS(pattrib->seqnum, tx_seq)) { + pattrib->ampdu_en = false;/* AGG BK */ + } else if (SN_EQUAL(pattrib->seqnum, tx_seq)) { + psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = + (tx_seq + 1) % 4096u; + + pattrib->ampdu_en = true;/* AGG EN */ + } else { + psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = + (pattrib->seqnum + 1) % 4096u; + + pattrib->ampdu_en = true;/* AGG EN */ } } } -- 2.34.1