AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-03-11 23:27:42 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: rtl8723au: Remove two layers of wrappers around rtw_cfg80211_indicate_scan_done()

Browse Source 
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2014-04-09 23:21:00 +02:00 committed by Greg Kroah-Hartman
parent 141bd353c5
commit 810c832f5d
5 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/rtl8723au/core/rtw_mlme.c
View File

@ -959,11 +959,6 @@ void rtw_indicate_disconnect23a(struct rtw_adapter *padapter)
}
inline void rtw_indicate_scan_done23a(struct rtw_adapter *padapter, bool aborted)
{
rtw_os_indicate_scan_done23a(padapter, aborted);
}
void rtw_scan_abort23a(struct rtw_adapter *adapter)
{
unsigned long start;
@ -985,7 +980,8 @@ void rtw_scan_abort23a(struct rtw_adapter *adapter)
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) {
if (!adapter->bDriverStopped && !adapter->bSurpriseRemoved)
DBG_8723A(FUNC_NDEV_FMT"waiting for scan_abort time out!\n", FUNC_NDEV_ARG(adapter->pnetdev));
rtw_indicate_scan_done23a(adapter, true);
rtw_cfg80211_indicate_scan_done(wdev_to_priv(adapter->rtw_wdev),
true);
}
pmlmeext->scan_abort = false;
}
@ -1546,7 +1542,7 @@ void rtw_scan_timeout_handler23a(unsigned long data)
spin_unlock_bh(&pmlmepriv->lock);
rtw_indicate_scan_done23a(adapter, true);
rtw_cfg80211_indicate_scan_done(wdev_to_priv(adapter->rtw_wdev), true);
}
static void rtw_auto_scan_handler(struct rtw_adapter *padapter)

1
drivers/staging/rtl8723au/include/mlme_osdep.h
View File

@ -20,7 +20,6 @@
void rtw_os_indicate_disconnect23a(struct rtw_adapter *adapter);
void rtw_os_indicate_connect23a(struct rtw_adapter *adapter);
void rtw_os_indicate_scan_done23a(struct rtw_adapter *padapter, bool aborted);
void rtw_report_sec_ie23a(struct rtw_adapter *adapter, u8 authmode, u8 *sec_ie);
void rtw_reset_securitypriv23a(struct rtw_adapter *adapter);

1
drivers/staging/rtl8723au/include/rtw_mlme.h
View File

@ -553,7 +553,6 @@ void rtw_free_assoc_resources23a(struct rtw_adapter *adapter,
int lock_scanned_queue);
void rtw_indicate_disconnect23a(struct rtw_adapter *adapter);
void rtw_indicate_connect23a(struct rtw_adapter *adapter);
void rtw_indicate_scan_done23a(struct rtw_adapter *padapter, bool aborted);
void rtw_scan_abort23a(struct rtw_adapter *adapter);
int rtw_restruct_sec_ie23a(struct rtw_adapter *adapter, u8 *in_ie, u8 *out_ie,

6
drivers/staging/rtl8723au/os_dep/mlme_linux.c
View File

@ -30,12 +30,6 @@ void rtw_os_indicate_connect23a(struct rtw_adapter *adapter)
rtw_signal_process(adapter->pid[2], SIGALRM);
}
void rtw_os_indicate_scan_done23a(struct rtw_adapter *padapter, bool aborted)
{
rtw_cfg80211_indicate_scan_done(wdev_to_priv(padapter->rtw_wdev),
aborted);
}
static struct rt_pmkid_list backupPMKIDList[NUM_PMKID_CACHE];
void rtw_reset_securitypriv23a(struct rtw_adapter *adapter)

3
drivers/staging/rtl8723au/os_dep/usb_intf.c
View File

@ -509,7 +509,8 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
up(&pwrpriv->lock);
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY))
rtw_indicate_scan_done23a(padapter, 1);
rtw_cfg80211_indicate_scan_done(
wdev_to_priv(padapter->rtw_wdev), true);
if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING))
rtw_indicate_disconnect23a(padapter);