staging: r8188eu: make rtw_reset_securitypriv() static

The function rtw_reset_securitypriv() is only used in rtw_mlme.c.
Make rtw_reset_securitypriv() and its user
rtw_os_indicate_disconnect() static to get one step closer to
removing os_dep/mlme_linux.c.

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220819125428.8412-8-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index 213c64303b01f4041750a919e6b04a5bcb029748..6e51d735b2bb6b2e17f539526fcd17fe1d89848c 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -795,6 +795,57 @@ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue)
 
 }
 
+static struct rt_pmkid_list backup_pmkid[NUM_PMKID_CACHE];
+
+static void rtw_reset_securitypriv(struct adapter *adapter)
+{
+       u8 backup_index;
+       u8 backup_counter;
+       u32 backup_time;
+
+       if (adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) {
+               /* 802.1x */
+               /*  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(&backup_pmkid[0], &adapter->securitypriv.PMKIDList[0], sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE);
+               backup_index = adapter->securitypriv.PMKIDIndex;
+               backup_counter = adapter->securitypriv.btkip_countermeasure;
+               backup_time = adapter->securitypriv.btkip_countermeasure_time;
+               memset((unsigned char *)&adapter->securitypriv, 0, sizeof(struct security_priv));
+
+               /*  Restore the PMK information to securitypriv structure for the following connection. */
+               memcpy(&adapter->securitypriv.PMKIDList[0],
+                           &backup_pmkid[0],
+                           sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE);
+               adapter->securitypriv.PMKIDIndex = backup_index;
+               adapter->securitypriv.btkip_countermeasure = backup_counter;
+               adapter->securitypriv.btkip_countermeasure_time = backup_time;
+               adapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen;
+               adapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled;
+       } else {
+               /* reset values in securitypriv */
+               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;
+       }
+}
+
+static void rtw_os_indicate_disconnect(struct adapter *adapter)
+{
+       /*  Do it first for tx broadcast pkt after disconnection issue! */
+       netif_carrier_off(adapter->pnetdev);
+
+       rtw_indicate_wx_disassoc_event(adapter);
+       rtw_reset_securitypriv(adapter);
+}
+
 /*
 *rtw_indicate_connect: the caller has to lock pmlmepriv->lock
 */

diff --git a/drivers/staging/r8188eu/include/mlme_osdep.h b/drivers/staging/r8188eu/include/mlme_osdep.h
index 2c0ce06bce82cc65ba995c6c92a883758ffdc93d..9cee84acff6bae63586673f779e4fa1f5e75f962 100644 (file)
--- a/drivers/staging/r8188eu/include/mlme_osdep.h
+++ b/drivers/staging/r8188eu/include/mlme_osdep.h
@@ -8,11 +8,9 @@
 #include "drv_types.h"
 
 void rtw_init_mlme_timer(struct adapter *padapter);
-void rtw_os_indicate_disconnect(struct adapter *adapter);
 void rtw_os_indicate_connect(struct adapter *adapter);
 void rtw_os_indicate_scan_done(struct adapter *padapter, bool aborted);
 
-void rtw_reset_securitypriv(struct adapter *adapter);
 void indicate_wx_scan_complete_event(struct adapter *padapter);
 
 #endif /* _MLME_OSDEP_H_ */

diff --git a/drivers/staging/r8188eu/os_dep/mlme_linux.c b/drivers/staging/r8188eu/os_dep/mlme_linux.c
index 48287aeaf502b8bc669f26d3d97eb0a7c297282f..d439ffaf9797172ac962904fc50bfe0f9f5d6467 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/mlme_linux.c
+++ b/drivers/staging/r8188eu/os_dep/mlme_linux.c
@@ -52,53 +52,3 @@ void rtw_os_indicate_scan_done(struct adapter *padapter, bool aborted)
 {
        indicate_wx_scan_complete_event(padapter);
 }
-
-static struct rt_pmkid_list backup_pmkid[NUM_PMKID_CACHE];
-
-void rtw_reset_securitypriv(struct adapter *adapter)
-{
-       u8 backup_index;
-       u8 backup_counter;
-       u32 backup_time;
-
-       if (adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) {
-               /* 802.1x */
-               /*  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(&backup_pmkid[0], &adapter->securitypriv.PMKIDList[0], sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE);
-               backup_index = adapter->securitypriv.PMKIDIndex;
-               backup_counter = adapter->securitypriv.btkip_countermeasure;
-               backup_time = adapter->securitypriv.btkip_countermeasure_time;
-               memset((unsigned char *)&adapter->securitypriv, 0, sizeof(struct security_priv));
-
-               /*  Restore the PMK information to securitypriv structure for the following connection. */
-               memcpy(&adapter->securitypriv.PMKIDList[0],
-                           &backup_pmkid[0],
-                           sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE);
-               adapter->securitypriv.PMKIDIndex = backup_index;
-               adapter->securitypriv.btkip_countermeasure = backup_counter;
-               adapter->securitypriv.btkip_countermeasure_time = backup_time;
-               adapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen;
-               adapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled;
-       } else {
-               /* reset values in securitypriv */
-               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;
-       }
-}
-
-void rtw_os_indicate_disconnect(struct adapter *adapter)
-{
-
-       netif_carrier_off(adapter->pnetdev); /*  Do it first for tx broadcast pkt after disconnection issue! */
-       rtw_indicate_wx_disassoc_event(adapter);
-       rtw_reset_securitypriv(adapter);
-}