diff options
| author |   Michael Straube <straube.linux@gmail.com> | 2022-08-19 14:54:27 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-08-23 15:40:26 +0200 |
| commit | 9863e257f53e629a5ceccdeb9bb3cc8a04c9deae (patch) | |
| tree | c5d2e2f9e0c0baeeced8404869586190040e3b86 /drivers/staging | |
| parent | staging: r8188eu: merge rtw_{os,}_indicate_connect() (diff) | |
| download | linux-dev-9863e257f53e629a5ceccdeb9bb3cc8a04c9deae.tar.xz linux-dev-9863e257f53e629a5ceccdeb9bb3cc8a04c9deae.zip | |
staging: r8188eu: merge rtw_{os,}_indicate_scan_done()
Merge rtw_os_indicate_scan_done() into rtw_indicate_scan_done().
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: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220819125428.8412-11-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/r8188eu/core/rtw_mlme.c | 2 | ||||
| -rw-r--r-- | drivers/staging/r8188eu/include/mlme_osdep.h | 1 | ||||
| -rw-r--r-- | drivers/staging/r8188eu/os_dep/mlme_linux.c | 5 |
3 files changed, 1 insertions, 7 deletions
diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c index bd86fb679d63..594bfaf27291 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -894,7 +894,7 @@ void rtw_indicate_disconnect(struct adapter *padapter) inline void rtw_indicate_scan_done(struct adapter *padapter, bool aborted) { - rtw_os_indicate_scan_done(padapter, aborted); + indicate_wx_scan_complete_event(padapter); } static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, struct wlan_network *pnetwork) diff --git a/drivers/staging/r8188eu/include/mlme_osdep.h b/drivers/staging/r8188eu/include/mlme_osdep.h index 5f63e2051419..d5e367e2d0de 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_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 105251f250dc..5bd2b2c31342 100644 --- a/drivers/staging/r8188eu/os_dep/mlme_linux.c +++ b/drivers/staging/r8188eu/os_dep/mlme_linux.c @@ -37,8 +37,3 @@ void rtw_init_mlme_timer(struct adapter *padapter) timer_setup(&pmlmepriv->scan_to_timer, _rtw_scan_timeout_handler, 0); timer_setup(&pmlmepriv->dynamic_chk_timer, _dynamic_check_timer_handlder, 0); } - -void rtw_os_indicate_scan_done(struct adapter *padapter, bool aborted) -{ - indicate_wx_scan_complete_event(padapter); -} |