staging: rtl8723bs: merge rtw_os_indicate_connect into rtw_indicate_connect

Merge the functionality of the function rtw_os_indicate_connect into the
function rtw_indicate_connect to reduce code in the os_dep directory.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Tested-by: Hans de Goede <hansg@kernel.org>
Reviewed-by: Hans de Goede <hansg@kernel.org>
Link: https://lore.kernel.org/r/20250801083131.82915-6-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index dbeba9cdfa7301174f886fb9b641833b52b46079..b77dbf104692868e50421b2e83fe426a5fd41c99 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -903,12 +903,21 @@ void rtw_indicate_connect(struct adapter *padapter)
 
                set_fwstate(pmlmepriv, _FW_LINKED);
 
-               rtw_os_indicate_connect(padapter);
+               if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) ||
+                   check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {
+                       rtw_cfg80211_ibss_indicate_connect(padapter);
+               } else {
+                       rtw_cfg80211_indicate_connect(padapter);
+               }
+
+               netif_carrier_on(padapter->pnetdev);
+
+               if (padapter->pid[2] != 0)
+                       rtw_signal_process(padapter->pid[2], SIGALRM);
        }
 
        rtw_set_to_roam(padapter, 0);
        rtw_set_scan_deny(padapter, 3000);
-
 }
 
 /*

diff --git a/drivers/staging/rtl8723bs/include/mlme_osdep.h b/drivers/staging/rtl8723bs/include/mlme_osdep.h
index 4bb7a01caf4a0b235a5513e4867cf93504b8314f..00c0a44c125a9fc7166b84010f3f094cc74bdb83 100644 (file)
--- a/drivers/staging/rtl8723bs/include/mlme_osdep.h
+++ b/drivers/staging/rtl8723bs/include/mlme_osdep.h
@@ -9,7 +9,6 @@
 
 
 extern void rtw_os_indicate_disconnect(struct adapter *adapter);
-extern void rtw_os_indicate_connect(struct adapter *adapter);
 extern void rtw_report_sec_ie(struct adapter *adapter, u8 authmode, u8 *sec_ie);
 
 void rtw_reset_securitypriv(struct adapter *adapter);

diff --git a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c b/drivers/staging/rtl8723bs/os_dep/mlme_linux.c
index f85e17ae0e7f58dd1f64228f1d7df20e82cb7dc1..326acbd8dc84255c6afdecbc5719cd2ae57a518d 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/mlme_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/mlme_linux.c
@@ -6,23 +6,6 @@
  ******************************************************************************/
 #include <drv_types.h>
 
-void rtw_os_indicate_connect(struct adapter *adapter)
-{
-       struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
-
-       if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true) ||
-               (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true)) {
-               rtw_cfg80211_ibss_indicate_connect(adapter);
-       } else {
-               rtw_cfg80211_indicate_connect(adapter);
-       }
-
-       netif_carrier_on(adapter->pnetdev);
-
-       if (adapter->pid[2] != 0)
-               rtw_signal_process(adapter->pid[2], SIGALRM);
-}
-
 static struct rt_pmkid_list   backupPMKIDList[NUM_PMKID_CACHE];
 void rtw_reset_securitypriv(struct adapter *adapter)
 {