From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) (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 59BB7270EB3 for ; Fri, 18 Apr 2025 09:48:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744969693; cv=none; b=F7YP4yyK2436LhxOL8IyvjWDbxWyl2YnACwssReo9/veYgEHkn5YV3TIZJ8oY8dpPhQo5o1xIb35jNy7EafIXJR9HISfn6kC4BSm2UAWzgMiym3jXftXZIYQqtzQ8QsaMbMEdkOxHb1KyMW9RTYzFfAbcUvuPYY6Ru6Za/VfnSQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744969693; c=relaxed/simple; bh=DxkK3p7GrM5By5DQbHXpcXd6g3kGREUwSwYkgTkB/7U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ctGGdKuEqBHZwtEEUwOFg6t2TCSUQ4ae4CjULwXH7p3stoRWiLMbp7IPZDRO/FCkxWTONe85UGiSrR+rPAYKDaSfQ89sXBuC9+0sQUvXNy/QG8czSdd/S8To7BJjv1AUPXx65pH6AsLq8ZmbIvREPOUpfi7HAw1lwPEj+/TI++w= 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=gbNc0RDE; arc=none smtp.client-ip=209.85.219.44 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="gbNc0RDE" Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-6f0ad74483fso19350226d6.1 for ; Fri, 18 Apr 2025 02:48:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744969689; x=1745574489; 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=sdfbOR1zA1/kD6+1UpkaIMBm10oYcWCdLqCqPrs+E94=; b=gbNc0RDEdEYooJRxwu9fbWqBlFgH/GYIpFg7c7ROd5N48XtUwPjhjgF0oXsQZibDlZ gbJ6BZ4kTtJK1tVKSAc2PQLpKZhBfYCdyfxX2kZ3RzcjSfGEZX4zxmlrUypTPwnmoCfz OOzPxMeVmxszsofh8vSU91FqpQ822Tyo5YFjk6cLG09Q2dGjnIVJbuFHCXK3QJ7Hvf81 +uSX678VXp2lRevkl1TknEEmCmwhSlmG4AcQUa9X3Ln20Os8MC/FE884vtQxogd4L5ZN Y191HVpqUrLbpUGQ/i07hHSV5RX0ulRj/7TnzNmPWbxvOdlT7wuoAMseS4cB0OibSCHW lmIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744969689; x=1745574489; 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=sdfbOR1zA1/kD6+1UpkaIMBm10oYcWCdLqCqPrs+E94=; b=n/ui9AuooZor/ntf2cHuNqikQyFeG5f1Sx9XQquDUqQYypr+gC1dwz4ZOBCNwASYqe 3kc9YSItEICetSNXLTmN6xrf5ofOsnKFKWLfpwmA79/FsR3vw8YCOcd8YAl7v11/2sxk rcRp/zReWAjmZ/g5WsBXyG2XUAheRpM5x505plb6Q6Zn/HaE9SUPDVPCSq1hbbXQ9Mxu DYAj+1haEwz9zEewSBAzqjpd+VVTd35x9CRj6S6OndDqm/0eZ8Klo90e4KDfgBkkAceV VpXpzDTvRjkAU1YvAuGS92W2967GPF5hKp5+iTRrq8FJuspRIzKxlV4VjW9gv58tqNqr QSXA== X-Forwarded-Encrypted: i=1; AJvYcCVcLO3WKmadO2zGELJWqS9qx6UW8KMRqdGkJDWRiuGJlzI9U8axkY1S6By94yAJvY1uMB7Ma/8VSPQR2s0=@vger.kernel.org X-Gm-Message-State: AOJu0Ywlm3spqlWgoIJZDg1sPvp23EMchGC81Jn6wHkSyDlxF8cz+2ti XkS7eMvcvlqA+JtnyWbsOtmw6ecg+mCjg7v/nJO4IP2AuirfCqao X-Gm-Gg: ASbGncsGv3rD9inCp1yfkruuIG0WVEx+ZE1DH/dDSVDhZuxUNEVha/RIG/TwNR4rkMa 3pgiIL7dXGFQoKnZXU7VNoul6BqVCpf2Kwh/FV3ZbeidsP0G+8dzERus7wmkiFExT8hQdMiZ15n rPtcLIgkjqFZGQpNTD83GIoaDz7n+MrQEreSXUVRmvsMgiD3vCtu5z7Jv0e3KaB2w5jx+x0f8Np Zej3xDHyccduGwvA6mxgkgoWvf+1chfKeT3eJhCkhAwMcPcxzoo51RRrxJMFqk0iCD4eWH7IFUy Q1Gb8+eqwebj3anTUVKtp5qjZl0L1zNjZhRbJGVBtT9k+Q== X-Google-Smtp-Source: AGHT+IGfDWujQP8zgljeuaFYveIZbjDANUu9Vn0oRVR1ib7/4VrrKoASaIFj4bYOGe4hyjEaG2DYKg== X-Received: by 2002:a05:6214:212e:b0:6e4:2dd7:5c88 with SMTP id 6a1803df08f44-6f2c469a93bmr42563876d6.38.1744969689295; Fri, 18 Apr 2025 02:48:09 -0700 (PDT) Received: from ubuntu ([105.112.229.239]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6f2c2bfcf9asm8797386d6.84.2025.04.18.02.48.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Apr 2025 02:48:09 -0700 (PDT) From: Abraham Samuel Adekunle To: julia.lawall@inria.fr, gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, david.laight.linux@gmail.com, dan.carpenter@linaro.org, andy@kernel.org, Abraham Samuel Adekunle Subject: [PATCH v11 2/2] staging: rtl8723bs: Use % 4096 instead of & 0xfff Date: Fri, 18 Apr 2025 09:47:55 +0000 Message-Id: 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 sequence number is constrained to a range of [0, 4095], which is a total of 4096 values. The bitmask operation using `& 0xfff` is used to perform this wrap-around. While this is functionally correct, it obscures the intended semantic of a 4096-based wrap. Using a modulo operation `% 4096u` makes the wrap-around logic explicit and easier to understand. It clearly signals that the sequence number cycles through a range of 4096 values. It also makes the code robust against potential changes of the 4096 upper limit, especially when it becomes a non power-of-2 value while the AND(&) works solely for power-of-2 values. The use of `% 4096u` also guarantees that the modulo operation is performed with unsigned arithmetic, preventing potential issues with the signed types. Found by Coccinelle. Suggested-by: Andy Shevchenko Suggested-by: David Laight Signed-off-by: Abraham Samuel Adekunle Reviewed-by: Andy Shevchenko --- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- drivers/staging/rtl8723bs/core/rtw_recv.c | 6 +++--- drivers/staging/rtl8723bs/core/rtw_xmit.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c index 952ce6dd5af9..f712ea0cabee 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -3511,7 +3511,7 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned ch /* if ((psta = rtw_get_stainfo(pstapriv, pmlmeinfo->network.mac_address)) != NULL) */ psta = rtw_get_stainfo(pstapriv, raddr); if (psta) { - start_seq = (psta->sta_xmitpriv.txseq_tid[status & 0x07]&0xfff) + 1; + start_seq = (psta->sta_xmitpriv.txseq_tid[status & 0x07] % 4096u) + 1; psta->BA_starting_seqctrl[status & 0x07] = start_seq; diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rtl8723bs/core/rtw_recv.c index a389ba5ecc6f..25411cc5c738 100644 --- a/drivers/staging/rtl8723bs/core/rtw_recv.c +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c @@ -1641,7 +1641,7 @@ static int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_n struct dvobj_priv *psdpriv = padapter->dvobj; struct debug_priv *pdbgpriv = &psdpriv->drv_dbg; u8 wsize = preorder_ctrl->wsize_b; - u16 wend = (preorder_ctrl->indicate_seq + wsize - 1) & 0xFFF;/* 4096; */ + u16 wend = (preorder_ctrl->indicate_seq + wsize - 1) % 4096u; /* Rx Reorder initialize condition. */ if (preorder_ctrl->indicate_seq == 0xFFFF) @@ -1657,7 +1657,7 @@ static int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_n /* 2. Incoming SeqNum is larger than the WinEnd => Window shift N */ /* */ if (SN_EQUAL(seq_num, preorder_ctrl->indicate_seq)) { - preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) & 0xFFF; + preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) % 4096u; } else if (SN_LESS(wend, seq_num)) { /* boundary situation, when seq_num cross 0xFFF */ @@ -1772,7 +1772,7 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reor list_del_init(&(prframe->u.hdr.list)); if (SN_EQUAL(preorder_ctrl->indicate_seq, pattrib->seq_num)) - preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) & 0xFFF; + preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) % 4096u; /* Set this as a lock to make sure that only one thread is indicating packet. */ /* pTS->RxIndicateState = RXTS_INDICATE_PROCESSING; */ diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c index 5def2467f42b..76f25ab6a779 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -943,7 +943,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr if (psta) { psta->sta_xmitpriv.txseq_tid[pattrib->priority]++; - psta->sta_xmitpriv.txseq_tid[pattrib->priority] &= 0xFFF; + psta->sta_xmitpriv.txseq_tid[pattrib->priority] %= 4096u; pattrib->seqnum = psta->sta_xmitpriv.txseq_tid[pattrib->priority]; SetSeqNum(hdr, pattrib->seqnum); @@ -964,12 +964,12 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr pattrib->ampdu_en = false;/* AGG BK */ } else if (SN_EQUAL(pattrib->seqnum, tx_seq)) { psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = - (tx_seq + 1) & 0xfff; + (tx_seq + 1) % 4096u; pattrib->ampdu_en = true;/* AGG EN */ } else { psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = - (pattrib->seqnum + 1) & 0xfff; + (pattrib->seqnum + 1) % 4096u; pattrib->ampdu_en = true;/* AGG EN */ } -- 2.34.1