From nobody Sat Feb 7 18:21:22 2026 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (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 9A14E625 for ; Wed, 28 Jan 2026 20:45:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769633123; cv=none; b=W1t0VjmXlHSCCxW/hn8+WNO1bAaMQ8HmRypTyEfRGTPMcen/2dbAffvScPwvQfjnioTEOCIkgLfn1xZsU9j7Pzkurnk5YtYap29FgoJZP0vpu6CfEc7i1ZhMbSRGhU6IJFEZjj0Kf+p1DrVzNJ2o/qD5e+0+EAwEhe/5ZKKGuvc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769633123; c=relaxed/simple; bh=ZYyUKN9p3PrUqQX/m6rx4VI4F3mHghv24h88NCaOZpU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=RcRuiE8Z/Cma+BvJber4AQz+YVGfYPie8HSuGMioWIKbHHX5TElXzkZm8I8FD9kWXv82kqBIydyKbfrWqi/E7HRVQjvczSZjip+ntsU3QRaSBmj8waAYfZyqrui0id+JTaxWIAUNimVomy7L2wBBiyrttUohSoec71Fobn4V4YA= 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=DrqyMEaM; arc=none smtp.client-ip=209.85.216.42 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="DrqyMEaM" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-34c27d14559so122400a91.2 for ; Wed, 28 Jan 2026 12:45:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769633122; x=1770237922; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=29Q5Wv+RhO5624ZMe7qIrVSuQL+rizLiHQMdD29EGs8=; b=DrqyMEaMRV32semh1U+lUV99Uh2caTWtqLO+6fomvxqDbq5tFSHcLMNe4Ot3VbmeSI C4vm4iJwv8blGJMe5Bj8YcUru0vZRvJXu63aYK+u1L5nkM9TJixE+pKPT2gZRu15Ug8q FWwLFomaUGbPCNQeflBNoGYxozHZwtgoPK285yBYPi/opJxDX+3KiXHMRQGnJmuPOE6H CObZdjf07g1Twz+PghPv31gTtwb4XrdSQRDmWOVPO6nOYD6Ne2G3y9T092lvwQ2313mR 2A/PmLLzMnpXS9cOeElIClSJOiwLpKhiBE0exqX0Sq+aJ8iwOX1eL516cDjUdQhst5in l3VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769633122; x=1770237922; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=29Q5Wv+RhO5624ZMe7qIrVSuQL+rizLiHQMdD29EGs8=; b=G72uSpZbdwmPwLbUfJJxX8y9fcEaG4pJQIL2zCdwYHoBlORXMBY+pcc3yx1mZs2253 9x/r0lA95y4UsNpL3VlubaxPxFgzMumljvFzBH3jMNDB3NtgR4MGQU7fdAASb5ZlnaVq qLbyDbA40DNhMSpYZnez0BfBR+n3CnjiJpbMamR+8Vhz2oYaeOomxLlmSNqGTGWd0NuS yRn/kkZ8KwumAxJ6TCZlso3b5u60CKdUXV99/07ZJWdFPv9hHThVxDbxWS3lXdMHOI3g TuICMbl0iV0L2CD6oJF5Le+KseW2Z2EtQ1pm85NINcCZyTtf1M8Dq8FFpGktPwhchzlc giGA== X-Forwarded-Encrypted: i=1; AJvYcCVFdHNVcdGQgax5jyZHhhxe/B/OY8PNiZdXSXDfG8BzBm3pS0L6DeRkRGvbhd/ReDL/pTV7gdaryL3p8ZI=@vger.kernel.org X-Gm-Message-State: AOJu0YxsFbNIJITgmeyhj8BowIZl6+swSbGt5Ovby2Z4j8ZHsL4MyXfD Az9CXUdW4jB9TWuByoBThBE5iiRwiYBcILNg7zxrUs3fEAwSHbRgeRuI X-Gm-Gg: AZuq6aJfsqbrQ6wQ7aWWKZPjfTY98T5oecqEnYb1i9TtrloZItr6URzU4OpocGk0OP9 6WUT9dAXn1vYED+taPaCeayVaWtKUfuHl0N0tws+o3Gz63Qe/uJenofz766VXUkpNZx/BAwFXJY qF0XPXIxzBtrCL5zzNBCvD1j7R6rX4TdAh27LyfOJXpnqKWFmZzIKskDHGNY1AkuitCGrgjNmt2 Myu+C3BMD9QCQxaUHtsNPPfeTduQ28hj29HVJQzmYJj5T/s0DoOtvtyop1olPO8MjXwLRG7nnar u96N2plieApdFMKJZrbw8Xca9u5lSrfiQKI5qBTSpxRyEsfTcYWF6MSVjXbML6Kbbo2jeSroBDR tN2U9ipYhQdORESjdFk0nFXoB5tQ7d1I0xeVY/OQZHTHiFsvydg4wh6gqagiiKbkiZXzyPMN3qj gQ0IgIYHzxWXHZcUBntDhdixA1rsIiJVmOMwhWC5B/viY= X-Received: by 2002:a17:90b:2705:b0:340:d06d:ea73 with SMTP id 98e67ed59e1d1-353fed74b1bmr5766506a91.19.1769633121824; Wed, 28 Jan 2026 12:45:21 -0800 (PST) Received: from tehuang-Alienware-m16-R2.. ([50.47.240.160]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3541110e107sm20279a91.14.2026.01.28.12.45.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jan 2026 12:45:21 -0800 (PST) From: Michael Huang To: Greg Kroah-Hartman Cc: Joe Perches , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Huang Subject: [PATCH] staging: rtl8723bs: refactor BSS Coexistence channel report logic Date: Wed, 28 Jan 2026 12:45:10 -0800 Message-ID: <20260128204510.53433-1-tehsiu.huang@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Refactor the 'ICS' array in issue_action_BSSCoexistPacket() to improve readability and maintainability. This addresses technical debt related to magic numbers and ambiguous array usage. The original implementation used a multi-purpose 2D array (ICS[8][15]) where magic numbers were prevalent and the first element of each row was overloaded as a status flag. This patch: - Introduces descriptive macros: BSS_COEX_MAX_CLASSES, BSS_COEX_MAX_CHANNELS, and BSS_COEX_MAX_INFO_LEN. - Splits the overloaded array into two distinct boolean arrays: 'class_active' (for group status) and 'ch_present' (for channel data). - Converts the logic to use 'bool' types and 0-indexed loops, conforming to standard C programming practices. - Adds defensive boundary checks (ch > 0 && ch < MAX) to ensure robustness against unexpected channel data. This refactoring maintains the current 2.4GHz reporting behavior while providing a structured and extensible foundation for future Operating Class support according to IEEE 802.11 specifications. Signed-off-by: Michael Huang --- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 41 +++++++------------ .../staging/rtl8723bs/include/rtw_mlme_ext.h | 3 ++ 2 files changed, 18 insertions(+), 26 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index 884fcce50d9c..481295224f14 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -3587,8 +3587,9 @@ static void issue_action_BSSCoexistPacket(struct adap= ter *padapter) struct mlme_ext_priv *pmlmeext =3D &(padapter->mlmeextpriv); struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; struct __queue *queue =3D &(pmlmepriv->scanned_queue); - u8 InfoContent[16] =3D {0}; - u8 ICS[8][15]; + u8 InfoContent[BSS_COEX_MAX_INFO_LEN] =3D {0}; + bool class_active[BSS_COEX_MAX_CLASSES] =3D {false}; + bool ch_present[BSS_COEX_MAX_CLASSES][BSS_COEX_MAX_CHANNELS] =3D {{false}= }; =20 if ((pmlmepriv->num_FortyMHzIntolerant =3D=3D 0) || (pmlmepriv->num_sta_n= o_ht =3D=3D 0)) return; @@ -3642,7 +3643,6 @@ static void issue_action_BSSCoexistPacket(struct adap= ter *padapter) =20 =20 /* */ - memset(ICS, 0, sizeof(ICS)); if (pmlmepriv->num_sta_no_ht > 0) { int i; =20 @@ -3667,46 +3667,35 @@ static void issue_action_BSSCoexistPacket(struct ad= apter *padapter) =20 p =3D rtw_get_ie(pbss_network->ies + _FIXED_IE_LENGTH_, WLAN_EID_HT_CAP= ABILITY, &len, pbss_network->ie_length - _FIXED_IE_LENGTH_); if (!p || len =3D=3D 0) {/* non-HT */ + u8 ch =3D pbss_network->configuration.ds_config; =20 - if (pbss_network->configuration.ds_config <=3D 0) - continue; - - ICS[0][pbss_network->configuration.ds_config] =3D 1; - - if (ICS[0][0] =3D=3D 0) - ICS[0][0] =3D 1; + if (ch > 0 && ch < BSS_COEX_MAX_CHANNELS) { + ch_present[0][ch] =3D true; + class_active[0] =3D true; + } } =20 } =20 spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); =20 - - for (i =3D 0; i < 8; i++) { + for (i =3D 0; i < BSS_COEX_MAX_CLASSES; i++) { int j, k =3D 0; =20 - if (ICS[i][0] !=3D 1) + if (!class_active[i]) continue; =20 - InfoContent[k] =3D i; + InfoContent[k++] =3D i; /* SET_BSS_INTOLERANT_ELE_REG_CLASS(InfoContent, i); */ - k++; =20 - for (j =3D 1; j <=3D 14; j++) { - if (ICS[i][j] !=3D 1) - continue; - - if (k < 16) { - InfoContent[k] =3D j; /* channel number */ - /* SET_BSS_INTOLERANT_ELE_CHANNEL(InfoContent+k, j); */ - k++; + for (j =3D 0; j < BSS_COEX_MAX_CHANNELS; j++) { + if (ch_present[i][j]) { + if (k < BSS_COEX_MAX_INFO_LEN) + InfoContent[k++] =3D j; /* channel number */ } } - pframe =3D rtw_set_ie(pframe, WLAN_EID_BSS_INTOLERANT_CHL_REPORT, k, In= foContent, &(pattrib->pktlen)); - } - } =20 =20 diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/sta= ging/rtl8723bs/include/rtw_mlme_ext.h index dd5080056e58..3a1067d6f164 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -41,6 +41,9 @@ #define _HW_STATE_STATION_ 0x02 #define _HW_STATE_AP_ 0x03 =20 +#define BSS_COEX_MAX_CLASSES 8 +#define BSS_COEX_MAX_CHANNELS 15 +#define BSS_COEX_MAX_INFO_LEN 16 =20 #define _1M_RATE_ 0 #define _2M_RATE_ 1 --=20 2.43.0