Commit 29c34f1d authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman

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 <philipp.g.hortmann@gmail.com> # Edimax N150
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220819125428.8412-10-straube.linux@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 93535436
...@@ -851,7 +851,10 @@ void rtw_indicate_connect(struct adapter *padapter) ...@@ -851,7 +851,10 @@ void rtw_indicate_connect(struct adapter *padapter)
rtw_led_control(padapter, LED_CTL_LINK); 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; pmlmepriv->to_roaming = 0;
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include "drv_types.h" #include "drv_types.h"
void rtw_init_mlme_timer(struct adapter *padapter); 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 rtw_os_indicate_scan_done(struct adapter *padapter, bool aborted);
void indicate_wx_scan_complete_event(struct adapter *padapter); void indicate_wx_scan_complete_event(struct adapter *padapter);
......
...@@ -38,16 +38,6 @@ void rtw_init_mlme_timer(struct adapter *padapter) ...@@ -38,16 +38,6 @@ void rtw_init_mlme_timer(struct adapter *padapter)
timer_setup(&pmlmepriv->dynamic_chk_timer, _dynamic_check_timer_handlder, 0); 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) void rtw_os_indicate_scan_done(struct adapter *padapter, bool aborted)
{ {
indicate_wx_scan_complete_event(padapter); indicate_wx_scan_complete_event(padapter);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment