From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.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 746F6295D95 for ; Wed, 30 Jul 2025 10:45:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753872317; cv=none; b=elOjeQ88L9pRE9HHDDmbd5QYFiO40OeIy3Z5bDQBuw8HYEYJwf3kToSO22DpVje+kwOOvN208U+2ill9U+2pYnTj+cQ9nO3gAEKf7NxBEQbFAJZu7S0SBt0oFZk2qV6Vni+928vHYtDrAezkKSDWLRW15b3H4IW7jmJ6H63dpZo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753872317; c=relaxed/simple; bh=zMYDgD1v9PbcRgvlt7dYWThewO6Q4BQc0fqBmXE/dmQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XiupCdztyG4TbXTvTv59SEKJ1krGb30XHD5YMXTmcqz8Fg2YTImDRvazHyUKnU6X2wJ2XI5xPgx/ulOcxsZVC/4/UenzvXChwi1fGvWJAItQxKwcyx1EZWjf9nWIaIWbVFTDhvXraHwxmnsW/xEKEIXBN/PnQ4FgrUJAjfMIw8E= 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=WAW42zRC; arc=none smtp.client-ip=209.85.208.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="WAW42zRC" Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-60c9d8a169bso10614512a12.1 for ; Wed, 30 Jul 2025 03:45:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753872314; x=1754477114; darn=lists.linux.dev; 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=4Orl0dxFN5prrJRMhCNo44wNjAVEDhcd1qwh2pT3Fzc=; b=WAW42zRCfP023oNRxkkE2ez+Act52FuO2iT3JmTpc5DQY+CPFlmAOzXo44NOxnlGcW stzM5eJ9LXHTAoggvz2GMcmnlS0By919+Lzyasx8RSxK3C6nYxQ93Z6FIhiPDp7iDSv/ q3EKhKfPNfsWP4o9WMlyRft5nhs0Qw3cmJsGEugrh9ncQvAYluavo71EwGntjKg4/cQd w64agX4JBzMDJcG8MqK58mswUcmDzGroiMz8ZNTXcNol1M1rrts42zU5YhHKAaGzlMh5 RJoqwctAM5nbZ2M3x0RYMHloDV4uCpw9b+XCbL3WQOWHWTcenaueqbPfCkbQTBnIFJSF r58g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753872314; x=1754477114; 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=4Orl0dxFN5prrJRMhCNo44wNjAVEDhcd1qwh2pT3Fzc=; b=L4CXzbhyR8xHwtVCido3zOXOP90czH9ZgEJJd/XnJhJ2X6mNjTuXf+eoShd8Fh9BRr i/2QswizUi/KUeJnzDYYPpwT9xvwJsxF7GgdTnJphIj7P/NxPDc3SVMKVBGTTjllUvCp GnsDG+WneLcOs6Ecsn5mMe477TuYebJTToeVy3mrFHM2pAQ2X82woq0NuuO70IrFuDGU 37H7IFG5GWQp7aV33Qb4AkEX6cHl1q9qDuYM42uwzkAR84Zy2+OTsupZIW2L98vECDsA 8DVDZvdwqvsgP21B+JFGI+Qe/jLnOvGxRnQ1z1glbL0y9mNaAlr1X/4XF2heCMlvCD1w skwg== X-Forwarded-Encrypted: i=1; AJvYcCXMCRWIpPejhrQhU4FTsozgQ6yi7hT3HfDjFmj3CstJlISd9YCLCuASVkVY4XQc9g2TqkRWNbeS8f95TU6P@lists.linux.dev X-Gm-Message-State: AOJu0Yw6EWKn8IP5vwgaZCAtP12cnpxGbjEgYnM4hJwKzYh8T9+mS05U 3X4LUdGiTIvW0MpF9l1Zd3c6KatmRZyNCmp3dxhA16mroGvkLp7tAN5X X-Gm-Gg: ASbGncthRd3TPX67D8C7S/TE/KHCZ7cVwTS3aw1boSdQASSXl4b3Q0rzk9Ce37CE7Ep c1wCz2mkInYvz9R/LayqmO7+pIkk3wJQulB/S5oU3O/gTuAtMtWYw2978g1t67fRbX3jmwZ3X5Q yOitdskfjGP8AYzJOs92qYLIIiX4yeQCimbSOXRXTGh4WcWfptxocU0s1NSBIIwJP0Y4Lf0nhIW SVOH2YFNGARsuF4I20yBFwGKWHB3tugrkHBVFx3gCYTcBj5iTiK1x6HcpmSMSTfy0jonQam4jm9 5LdI3SRaoRA2VWl+K/VJQTNQbwTiJYv3p3xkprsWttFWRUsokBrqffZPbw5BUiCh0S0ycUiVDbt Nfymr86F86RJvFT8Jm900BD6B39gAu5lt/q/qQ6ti8u3fwd3tgA13Zl3N X-Google-Smtp-Source: AGHT+IHulO8SbF+m+xqs94001tnJHzK4YfZ6e4AqFOBfQddGkX20d5N5vga3aLzI/716AKlWIiQMHQ== X-Received: by 2002:a50:9fec:0:b0:609:a91:87e with SMTP id 4fb4d7f45d1cf-61586eef919mr1936150a12.1.1753872313417; Wed, 30 Jul 2025 03:45:13 -0700 (PDT) Received: from tumbleweed (ip-77-25-32-208.web.vodafone.de. [77.25.32.208]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6157974fde0sm1582734a12.7.2025.07.30.03.45.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jul 2025 03:45:13 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: hdegoede@redhat.com, Larry.Finger@lwfinger.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 8/8] staging: rtl8723bs: move rtw_reset_securitypriv to core/rtw_mlme.c Date: Wed, 30 Jul 2025 12:45:01 +0200 Message-ID: <20250730104501.150270-9-straube.linux@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250730104501.150270-1-straube.linux@gmail.com> References: <20250730104501.150270-1-straube.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Move the function rtw_reset_securitypriv from os_dep/mlme_linux.c to core/rtw_mlme.c to reduce code in the os_dep directory. The file os_dep/mlme_linux.c is finally empty now and we can remove it. Signed-off-by: Michael Straube --- drivers/staging/rtl8723bs/Makefile | 1 - drivers/staging/rtl8723bs/core/rtw_mlme.c | 60 +++++++++++++++++ drivers/staging/rtl8723bs/include/drv_types.h | 1 - .../staging/rtl8723bs/include/mlme_osdep.h | 13 ---- drivers/staging/rtl8723bs/include/rtw_mlme.h | 1 + drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 67 ------------------- 6 files changed, 61 insertions(+), 82 deletions(-) delete mode 100644 drivers/staging/rtl8723bs/include/mlme_osdep.h delete mode 100644 drivers/staging/rtl8723bs/os_dep/mlme_linux.c diff --git a/drivers/staging/rtl8723bs/Makefile b/drivers/staging/rtl8723bs/Makefile index 8560b84a3146..19c0525ec3e0 100644 --- a/drivers/staging/rtl8723bs/Makefile +++ b/drivers/staging/rtl8723bs/Makefile @@ -48,7 +48,6 @@ r8723bs-y = \ hal/HalHWImg8723B_RF.o \ hal/HalPhyRf_8723B.o \ os_dep/ioctl_cfg80211.o \ - os_dep/mlme_linux.o \ os_dep/osdep_service.o \ os_dep/os_intfs.o \ os_dep/recv_linux.o \ diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 1c720947955e..69b64d605186 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -1116,6 +1116,66 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net rtw_update_ht_cap(padapter, cur_network->network.ies, cur_network->network.ie_length, (u8) cur_network->network.configuration.ds_config); } +static struct rt_pmkid_list backupPMKIDList[NUM_PMKID_CACHE]; +void rtw_reset_securitypriv(struct adapter *adapter) +{ + u8 backupPMKIDIndex = 0; + u8 backupTKIPCountermeasure = 0x00; + u32 backupTKIPcountermeasure_time = 0; + /* add for CONFIG_IEEE80211W, none 11w also can use */ + struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; + + spin_lock_bh(&adapter->security_key_mutex); + + if (adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) { + /* 802.1x */ + /* Added by Albert 2009/02/18 */ + /* We have to backup the PMK information for WiFi PMK Caching test item. */ + /* */ + /* Backup the btkip_countermeasure information. */ + /* When the countermeasure is trigger, the driver have to disconnect with AP for 60 seconds. */ + + memcpy(&backupPMKIDList[0], &adapter->securitypriv.PMKIDList[0], sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE); + backupPMKIDIndex = adapter->securitypriv.PMKIDIndex; + backupTKIPCountermeasure = adapter->securitypriv.btkip_countermeasure; + backupTKIPcountermeasure_time = adapter->securitypriv.btkip_countermeasure_time; + + /* reset RX BIP packet number */ + pmlmeext->mgnt_80211w_IPN_rx = 0; + + memset((unsigned char *)&adapter->securitypriv, 0, sizeof(struct security_priv)); + + /* Added by Albert 2009/02/18 */ + /* Restore the PMK information to securitypriv structure for the following connection. */ + memcpy(&adapter->securitypriv.PMKIDList[0], &backupPMKIDList[0], sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE); + adapter->securitypriv.PMKIDIndex = backupPMKIDIndex; + adapter->securitypriv.btkip_countermeasure = backupTKIPCountermeasure; + adapter->securitypriv.btkip_countermeasure_time = backupTKIPcountermeasure_time; + + adapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen; + adapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled; + + } else { + /* reset values in securitypriv */ + /* if (adapter->mlmepriv.fw_state & WIFI_STATION_STATE) */ + /* */ + struct security_priv *psec_priv = &adapter->securitypriv; + + psec_priv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open; /* open system */ + psec_priv->dot11PrivacyAlgrthm = _NO_PRIVACY_; + psec_priv->dot11PrivacyKeyIndex = 0; + + psec_priv->dot118021XGrpPrivacy = _NO_PRIVACY_; + psec_priv->dot118021XGrpKeyid = 1; + + psec_priv->ndisauthtype = Ndis802_11AuthModeOpen; + psec_priv->ndisencryptstatus = Ndis802_11WEPDisabled; + /* */ + } + /* add for CONFIG_IEEE80211W, none 11w also can use */ + spin_unlock_bh(&adapter->security_key_mutex); +} + /* Notes: the function could be > passive_level (the same context as Rx tasklet) */ /* pnetwork : returns from rtw_joinbss_event_callback */ /* ptarget_wlan: found from scanned_queue */ diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h index 080c321665c0..f1c16ddacc83 100644 --- a/drivers/staging/rtl8723bs/include/drv_types.h +++ b/drivers/staging/rtl8723bs/include/drv_types.h @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/staging/rtl8723bs/include/mlme_osdep.h b/drivers/staging/rtl8723bs/include/mlme_osdep.h deleted file mode 100644 index 3930d9e6dab7..000000000000 --- a/drivers/staging/rtl8723bs/include/mlme_osdep.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/****************************************************************************** - * - * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * - ******************************************************************************/ -#ifndef __MLME_OSDEP_H_ -#define __MLME_OSDEP_H_ - - -void rtw_reset_securitypriv(struct adapter *adapter); - -#endif /* _MLME_OSDEP_H_ */ diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging/rtl8723bs/include/rtw_mlme.h index 3cf68b85eb32..4c15d0194d4f 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h @@ -395,5 +395,6 @@ u8 rtw_to_roam(struct adapter *adapter); int rtw_select_roaming_candidate(struct mlme_priv *pmlmepriv); void rtw_sta_media_status_rpt(struct adapter *adapter, struct sta_info *psta, u32 mstatus); +void rtw_reset_securitypriv(struct adapter *adapter); #endif /* __RTL871X_MLME_H_ */ diff --git a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c b/drivers/staging/rtl8723bs/os_dep/mlme_linux.c deleted file mode 100644 index 918d9496d7cc..000000000000 --- a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c +++ /dev/null @@ -1,67 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/****************************************************************************** - * - * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * - ******************************************************************************/ -#include - -static struct rt_pmkid_list backupPMKIDList[NUM_PMKID_CACHE]; -void rtw_reset_securitypriv(struct adapter *adapter) -{ - u8 backupPMKIDIndex = 0; - u8 backupTKIPCountermeasure = 0x00; - u32 backupTKIPcountermeasure_time = 0; - /* add for CONFIG_IEEE80211W, none 11w also can use */ - struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; - - spin_lock_bh(&adapter->security_key_mutex); - - if (adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) { - /* 802.1x */ - /* Added by Albert 2009/02/18 */ - /* We have to backup the PMK information for WiFi PMK Caching test item. */ - /* */ - /* Backup the btkip_countermeasure information. */ - /* When the countermeasure is trigger, the driver have to disconnect with AP for 60 seconds. */ - - memcpy(&backupPMKIDList[0], &adapter->securitypriv.PMKIDList[0], sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE); - backupPMKIDIndex = adapter->securitypriv.PMKIDIndex; - backupTKIPCountermeasure = adapter->securitypriv.btkip_countermeasure; - backupTKIPcountermeasure_time = adapter->securitypriv.btkip_countermeasure_time; - - /* reset RX BIP packet number */ - pmlmeext->mgnt_80211w_IPN_rx = 0; - - memset((unsigned char *)&adapter->securitypriv, 0, sizeof(struct security_priv)); - - /* Added by Albert 2009/02/18 */ - /* Restore the PMK information to securitypriv structure for the following connection. */ - memcpy(&adapter->securitypriv.PMKIDList[0], &backupPMKIDList[0], sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE); - adapter->securitypriv.PMKIDIndex = backupPMKIDIndex; - adapter->securitypriv.btkip_countermeasure = backupTKIPCountermeasure; - adapter->securitypriv.btkip_countermeasure_time = backupTKIPcountermeasure_time; - - adapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen; - adapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled; - - } else { - /* reset values in securitypriv */ - /* if (adapter->mlmepriv.fw_state & WIFI_STATION_STATE) */ - /* */ - struct security_priv *psec_priv = &adapter->securitypriv; - - psec_priv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open; /* open system */ - psec_priv->dot11PrivacyAlgrthm = _NO_PRIVACY_; - psec_priv->dot11PrivacyKeyIndex = 0; - - psec_priv->dot118021XGrpPrivacy = _NO_PRIVACY_; - psec_priv->dot118021XGrpKeyid = 1; - - psec_priv->ndisauthtype = Ndis802_11AuthModeOpen; - psec_priv->ndisencryptstatus = Ndis802_11WEPDisabled; - /* */ - } - /* add for CONFIG_IEEE80211W, none 11w also can use */ - spin_unlock_bh(&adapter->security_key_mutex); -} -- 2.50.1