From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B0AD4369D51 for ; Tue, 14 Jul 2026 23:34:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784072053; cv=none; b=g215uhTQ2RbMByWjEpHCD2tv9L9O3Xqd9fz03/5DYnUbYREGd8ymohe1TGtcZKv9MBKHWfVbMtH3TAi7hr2rJHWIwncl8Cg8jBfMVsK0UoSaGpx1I6ABVHJbg0n50zn7XEt5O6xyYaJ1V2L9S+dBw8QbImjTv1SvzzvQSwSkmf8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784072053; c=relaxed/simple; bh=AVQSsGTOVXYYBdP0NTTa7c1URicT5uyRhsaY0aYKy/Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QqZtHHu3Wc+m91btTYuEPcF4RYstw6MBOkKMhPQ6SiLeGUVdVsIuTcFmrgr6IlDmnNPF0fekjuI+arPFok8lx00mF/QYRSpRKtURrNz0WNEobGQNCrwKIU6RBTPysk0SLioY77/D+cCN06g5K5ioVnnFokE0tV7Vxvo6cLjk3XE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fxL4a3Fy; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fxL4a3Fy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28E2A1F00A3A; Tue, 14 Jul 2026 23:34:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784072052; bh=7k6tBgG+hNYX3Z5EWQ8S9CWN7Pz3aCm+g9OfMhXpVcY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fxL4a3FyTxpV2v5BoRakCHjD0IEWjE/oNB9IVwquw4KyuVXGaGdc8vl43BFX2Oy+8 a+lX74AUVbCaWB/IRJ30KKVpI0fpxeklm6vruyJqOBb+vLNTUlDGrs3ULYIyAX5pSK 5EwkIvEYDXCs7ywfscPlRK8NNFlRjhEQ6k3JEOMra6OeTRqDdR+hMB80++zw/O04mt 9E1roI4wVoDb52wgWHYKXxlRujxASkTzXoizsJJZVts/gi+aKGELae0ngTJcxfxByP /UtUIOU04p6Yv4+KYIY8N2hvWWwdyaivuA+m8ObwYtz4mOGLeMfSBxv2y23F6oKK7u Sr+sL0wPONZgA== From: Sasha Levin To: stable@vger.kernel.org Cc: Fabio Aiuto , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH 5.10.y 5/8] staging: rtl8723bs: remove 5Ghz code blocks Date: Tue, 14 Jul 2026 19:34:04 -0400 Message-ID: <20260714233407.3591885-5-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260714233407.3591885-1-sashal@kernel.org> References: <2026071352-wreckage-humorless-3481@gregkh> <20260714233407.3591885-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Fabio Aiuto [ Upstream commit ddd7c8b0033ba01a0ee605697f12a33fd31e6fca ] remove 5 Ghz code blocks, related to networks working over channel numbers above 14. Signed-off-by: Fabio Aiuto Link: https://lore.kernel.org/r/c64443b92ce1a60f568db153842a62e3244a8c3a.1626874164.git.fabioaiuto83@gmail.com Signed-off-by: Greg Kroah-Hartman Stable-dep-of: a1fc19d61f66 ("staging: rtl8723bs: fix WEP length underflow and OOB read in OnAuth()") Signed-off-by: Sasha Levin --- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 7 ++----- .../staging/rtl8723bs/os_dep/ioctl_linux.c | 20 +++---------------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c index db5abaafa91a2f..2742c7da75a6cd 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -4116,7 +4116,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) p = rtw_get_ie(pbss_network->IEs + _FIXED_IE_LENGTH_, _HT_CAPABILITY_IE_, &len, pbss_network->IELength - _FIXED_IE_LENGTH_); if ((p == NULL) || (len == 0)) {/* non-HT */ - if ((pbss_network->Configuration.DSConfig <= 0) || (pbss_network->Configuration.DSConfig > 14)) + if (pbss_network->Configuration.DSConfig <= 0) continue; ICS[0][pbss_network->Configuration.DSConfig] = 1; @@ -6118,10 +6118,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) { struct HT_info_element *pht_info = (struct HT_info_element *)(pIE->data); - if (pnetwork->Configuration.DSConfig > 14) { - if ((pregpriv->bw_mode >> 4) > CHANNEL_WIDTH_20) - cbw40_enable = 1; - } else { + if (pnetwork->Configuration.DSConfig <= 14) { if ((pregpriv->bw_mode & 0x0f) > CHANNEL_WIDTH_20) cbw40_enable = 1; } diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c index fa167c68d9b5cc..e9d006cdcde7ed 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c @@ -135,14 +135,7 @@ static char *translate_scan(struct adapter *padapter, else snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bg"); } else { - if (pnetwork->network.Configuration.DSConfig > 14) { - if (vht_cap) - snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11AC"); - else if (ht_cap) - snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11an"); - else - snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11a"); - } else { + if (pnetwork->network.Configuration.DSConfig <= 14) { if (ht_cap) snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11gn"); else @@ -762,7 +755,7 @@ static int rtw_wx_get_name(struct net_device *dev, struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); u32 ht_ielen = 0; char *p; - u8 ht_cap = false, vht_cap = false; + u8 ht_cap = false; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network; NDIS_802_11_RATES_EX* prates = NULL; @@ -788,14 +781,7 @@ static int rtw_wx_get_name(struct net_device *dev, else snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11bg"); } else { - if (pcur_bss->Configuration.DSConfig > 14) { - if (vht_cap) - snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11AC"); - else if (ht_cap) - snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11an"); - else - snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11a"); - } else { + if (pcur_bss->Configuration.DSConfig <= 14) { if (ht_cap) snprintf(wrqu->name, IFNAMSIZ, "IEEE 802.11gn"); else -- 2.53.0