From nobody Mon Jun 8 07:22:48 2026 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 F153C3D3CF7 for ; Wed, 3 Jun 2026 12:28:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780489705; cv=none; b=XkoxYbakGSO0T/xUqaIKdBvw3oRTjhOHptzFB4tzHuIo7XHIIlkotGRxk0Wo7ge4W5XDWgVFh3EI+2+8XfrlyAb1fizLGaCZV0G3Pd2o21lY66YMK29DtY3QrkYHdZLhRJ2wdFIiEOoLNqLn/qocMNevfXPTv9KxT6aP70TK5Us= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780489705; c=relaxed/simple; bh=UTeBI6QGoPmPl2MmCdp28u8qGVMtzm/2Hx+2Y52zySQ=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=emI/B1UX1DrJP3iGPZRIaY2xVKR7SuKApvie3BYD3mB3KbH3VWYczWiL4Gy+hbqXW1QnmzNKQ7Oef9EpJ87ZgbnvRf+MJyfdM4syzGQFobIje/tky+3YsFU/oLtGXWLnOGTrCpCbQ+TkqIRZt3CxJ3pzShxG69pw7Cz7E4JfuiU= 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=ffSaGVzz; arc=none smtp.client-ip=209.85.216.51 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="ffSaGVzz" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-36c68964315so2495955a91.2 for ; Wed, 03 Jun 2026 05:28:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780489703; x=1781094503; 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=g+8EUECEmLbqJRQ27yLo90YIQj1JcoOVZIX3/p3P7sk=; b=ffSaGVzzx+5JWUAvUvJdf1XYAcx7oIGlS/Fr/OeCvVujHdbea1THFd3UQgfSjQQaem 05ApckG3OB96nWolOS4ZKIKw3vYkeNEv/gw5zajw08OTmZgjhgCr7GTqt1qTxG2TqQnC KlDWmt032xmIDrx5nV67dHfd3NWKHbmF5JGb7I7q1lNZHPNjMhhcB/NcDM7mYnE2JZac 71fonrCEb57bbYEINwazroD+sFj3zTsMB4S6Y5YQKZnfDxsYEWsAiA890eGRIiSh0JfF WAq8tYP/0dSh409tmKm3EFL4NQA1L7/9JH6jQvXOxfZDr+BCh8Ir/yUxMFgNZR/euiRW 5Vpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780489703; x=1781094503; 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=g+8EUECEmLbqJRQ27yLo90YIQj1JcoOVZIX3/p3P7sk=; b=mxS+g4ptCtu16/Nkvy755J7oGQe+f6sjbucAzVZhgeN1ChK3TtKkShZaPiC16W5GkR LNPlXlOd6voAkYrYlc+V4f0IltKbwKZqinryJL6xi9T8hPlAXMOyreXLEln6Tsy58mlX fIpZfbSw/8qGu2LTOJ3hXM6sUrAsJ4gv8lLtLckOS23cLYsSF1NODwbWNtEbUqkafQVY ozvrym9/ResdTcXi1pN8zl/t4Bz4IprYgdGr2HSql8nofuGXMxXiY7HRlu3GT3lW+jh2 AUqSGXGaNnObuMw2j4QQ/ud3Nmxdpysc8WrDqNR6o/N/mnAjOfxYRKuKPNLG8kwy6n7G jhHw== X-Forwarded-Encrypted: i=1; AFNElJ9ZEoN5Bq+a3uqs+5bIHRyA+4rjGptP2hGCtnt2Ecx/zU8Sf8SN7QZOaYPwMhv/myXkVEXRx0ZtSaRWGRA=@vger.kernel.org X-Gm-Message-State: AOJu0YwXzsnZnP1mCaN4XFbWlfNa/qUHD/GjUNxiVmJsA4veXANBNt5h FX9KEFe0jJN3hs7TcxtGjp+5qAezE5l2R8o2H7kQ5gqq2SCNZ7+l93KW X-Gm-Gg: Acq92OGytOosQV5KyyVx4iI03VYiBXF9qrfrVtkmbMBPtpEAdVZ86p9hUFT3ozirksA E+A5yxow7stdOZ2o6fofGDTQfqFTPNamdGkQdGI6FKJodDlDBuojf0q5yxPd7ebQnkcXlX+dh05 2G+jbsJo7OP6YiLJ0zArKCUQaPYC9kdy5LoB+qpX68wCZcda0+n8hg4cw7nSRo7xCEtEXgPz2LS LGQRl5Ng2Ttb569dUKJh/cOmb+0Ik7Wo5EQ0rhFQcL6mAUo6Wu7FiAn+HgEHEUX9hWaFLlak7bR 3uts4BLkUSGTS+ngRKM5nQaZC665ci9O2yMQhZ1x98LMD7tRPh/a5PznuV0VHYr9YqhrGERNUr3 jjp6+caRiryIjkPYeAvv/Z+zhuB2NOFL7CinkBKKXRtgc5YROiz6LFwl9zm58PKHgkjeE+C20WG +srD4/EAsyVSI1GyCAG9WStZ320EiJqwWRfV8g84yjkXvWb3V3S3DFe0td6cRnuQ== X-Received: by 2002:a17:902:e74d:b0:2c0:db23:4c9 with SMTP id d9443c01a7336-2c163fa825dmr32407455ad.20.1780489703200; Wed, 03 Jun 2026 05:28:23 -0700 (PDT) Received: from SGN-LDSENG.tasernet.com ([2405:4800:5cc3:11a:1ac0:4dff:fe8b:4a69]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c16609df63sm23746135ad.40.2026.06.03.05.28.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jun 2026 05:28:22 -0700 (PDT) From: Cong Nguyen To: Greg Kroah-Hartman Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Cong Nguyen Subject: [PATCH] staging: rtl8723bs: remove unused network_type_in_use field Date: Wed, 3 Jun 2026 19:28:06 +0700 Message-Id: <20260603122806.1330145-1-congnt264@gmail.com> X-Mailer: git-send-email 2.25.1 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" The network_type_in_use member of struct wlan_bssid_ex is write-only: nothing in the driver ever reads it. It is assigned in three places, none of which feed anything: - collect_bss_info() hard-codes it to Ndis802_11OFDM24 for every parsed beacon/probe response, regardless of the network's actual band or rates (it is even wrong for 5 GHz APs, which the same function explicitly handles). - rtw_check_beacon_data() and rtw_update_registrypriv_dev_network() derive it from the wireless mode via a switch, but the result is likewise never consumed. The live PHY classification the driver actually acts on is kept in wlan_network.network_type (the WIRELESS_11x value), so this NDIS-era field is redundant. struct wlan_bssid_ex is an internal structure passed by pointer through the driver command queue; it is never serialized to firmware or onto the air (the wire data lives in ies[]), so dropping a member is layout-safe as long as the module is rebuilt as a whole. enum ndis_802_11_network_type existed only to type this field, so remove it as well. No functional change. Signed-off-by: Cong Nguyen --- drivers/staging/rtl8723bs/core/rtw_ap.c | 15 --------------- drivers/staging/rtl8723bs/core/rtw_mlme.c | 16 ---------------- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 -- drivers/staging/rtl8723bs/include/wlan_bssdef.h | 11 +---------- 4 files changed, 1 insertion(+), 43 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8= 723bs/core/rtw_ap.c index 4b4012411011..9a0bc06df6ad 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ap.c +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c @@ -1056,21 +1056,6 @@ int rtw_check_beacon_data(struct adapter *padapter, = u8 *pbuf, int len) if (p && ie_len > 0) pHT_info_ie =3D p; =20 - switch (network_type) { - case WIRELESS_11B: - pbss_network->network_type_in_use =3D Ndis802_11DS; - break; - case WIRELESS_11G: - case WIRELESS_11BG: - case WIRELESS_11G_24N: - case WIRELESS_11BG_24N: - pbss_network->network_type_in_use =3D Ndis802_11OFDM24; - break; - default: - pbss_network->network_type_in_use =3D Ndis802_11OFDM24; - break; - } - pmlmepriv->cur_network.network_type =3D network_type; =20 pmlmepriv->htpriv.ht_option =3D false; diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index ddfc56f0253d..587246668a0b 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -2127,22 +2127,6 @@ void rtw_update_registrypriv_dev_network(struct adap= ter *adapter) =20 pdev_network->rssi =3D 0; =20 - switch (pregistrypriv->wireless_mode) { - case WIRELESS_11B: - pdev_network->network_type_in_use =3D (Ndis802_11DS); - break; - case WIRELESS_11G: - case WIRELESS_11BG: - case WIRELESS_11_24N: - case WIRELESS_11G_24N: - case WIRELESS_11BG_24N: - pdev_network->network_type_in_use =3D (Ndis802_11OFDM24); - break; - default: - /* TODO */ - break; - } - pdev_network->configuration.ds_config =3D (pregistrypriv->channel); =20 if (cur_network->network.infrastructure_mode =3D=3D Ndis802_11IBSS) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index 5f00fe282d1b..1235d43789c8 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -3971,8 +3971,6 @@ u8 collect_bss_info(struct adapter *padapter, union r= ecv_frame *precv_frame, str memcpy(bssid->supported_rates + i, (p + 2), len); } =20 - bssid->network_type_in_use =3D Ndis802_11OFDM24; - if (bssid->ie_length < 12) return _FAIL; =20 diff --git a/drivers/staging/rtl8723bs/include/wlan_bssdef.h b/drivers/stag= ing/rtl8723bs/include/wlan_bssdef.h index 812a68394268..f2e1c0834ffc 100644 --- a/drivers/staging/rtl8723bs/include/wlan_bssdef.h +++ b/drivers/staging/rtl8723bs/include/wlan_bssdef.h @@ -23,14 +23,6 @@ struct ndis_802_11_ssid { u8 ssid[32]; }; =20 -enum ndis_802_11_network_type { - Ndis802_11FH, - Ndis802_11DS, - Ndis802_11OFDM5, - Ndis802_11OFDM24, - Ndis802_11NetworkTypeMax /* not a real type, defined as an upper boun= d */ -}; - /* FW will only save the channel number in DSConfig. ODI Handler will convert the channel number to freq. number. @@ -65,7 +57,7 @@ struct ndis_80211_var_ie { /* Length is the 4 bytes multiples of the sum of * ETH_ALEN + 2 + * sizeof (struct ndis_802_11_ssid) + sizeof (u32) + - * sizeof (long) + sizeof (enum ndis_802_11_network_type) + + * sizeof (long) + * sizeof (struct ndis_802_11_conf) + sizeof (NDIS_802_11_RATES_EX) + ie_l= ength * * Except for ie_length, all other fields are fixed length. Therefore, we = can @@ -159,7 +151,6 @@ struct wlan_bssid_ex { struct ndis_802_11_ssid ssid; u32 privacy; long rssi;/* in dBM, raw data , get from PHY) */ - enum ndis_802_11_network_type network_type_in_use; struct ndis_802_11_conf configuration; enum ndis_802_11_network_infrastructure infrastructure_mode; NDIS_802_11_RATES_EX supported_rates; --=20 2.25.1