From: Michael Straube Date: Fri, 19 Aug 2022 12:54:26 +0000 (+0200) Subject: staging: r8188eu: merge rtw_{os,}_indicate_connect() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=29c34f1d08e4d29b23dc919bbd02e56f41aff0ce;p=linux.git staging: r8188eu: merge rtw_{os,}_indicate_connect() Merge rtw_os_indicate_connect() into rtw_indicate_connect(). It looks like the driver was originaly written to support different operating systems. We do not need this wrapping into an extra _os_ function obviously. Tested-by: Philipp Hortmann # Edimax N150 Signed-off-by: Michael Straube Link: https://lore.kernel.org/r/20220819125428.8412-10-straube.linux@gmail.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c index 3050c85dec2cd..bd86fb679d638 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -851,7 +851,10 @@ void rtw_indicate_connect(struct adapter *padapter) rtw_led_control(padapter, LED_CTL_LINK); - rtw_os_indicate_connect(padapter); + rtw_indicate_wx_assoc_event(padapter); + netif_carrier_on(padapter->pnetdev); + if (padapter->pid[2] != 0) + rtw_signal_process(padapter->pid[2], SIGALRM); } pmlmepriv->to_roaming = 0; diff --git a/drivers/staging/r8188eu/include/mlme_osdep.h b/drivers/staging/r8188eu/include/mlme_osdep.h index 9cee84acff6ba..5f63e2051419d 100644 --- a/drivers/staging/r8188eu/include/mlme_osdep.h +++ b/drivers/staging/r8188eu/include/mlme_osdep.h @@ -8,7 +8,6 @@ #include "drv_types.h" void rtw_init_mlme_timer(struct adapter *padapter); -void rtw_os_indicate_connect(struct adapter *adapter); void rtw_os_indicate_scan_done(struct adapter *padapter, bool aborted); void indicate_wx_scan_complete_event(struct adapter *padapter); diff --git a/drivers/staging/r8188eu/os_dep/mlme_linux.c b/drivers/staging/r8188eu/os_dep/mlme_linux.c index d439ffaf97971..105251f250dc6 100644 --- a/drivers/staging/r8188eu/os_dep/mlme_linux.c +++ b/drivers/staging/r8188eu/os_dep/mlme_linux.c @@ -38,16 +38,6 @@ void rtw_init_mlme_timer(struct adapter *padapter) timer_setup(&pmlmepriv->dynamic_chk_timer, _dynamic_check_timer_handlder, 0); } -void rtw_os_indicate_connect(struct adapter *adapter) -{ - - rtw_indicate_wx_assoc_event(adapter); - netif_carrier_on(adapter->pnetdev); - if (adapter->pid[2] != 0) - rtw_signal_process(adapter->pid[2], SIGALRM); - -} - void rtw_os_indicate_scan_done(struct adapter *padapter, bool aborted) { indicate_wx_scan_complete_event(padapter);