Commit 810c832f authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

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



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 141bd353

drivers/staging/rtl8723au/core/rtw_mlme.c

+3 −7
Original line number Diff line number Diff line
@@ -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)

drivers/staging/rtl8723au/include/mlme_osdep.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/rtl8723au/include/rtw_mlme.h

+0 −1
Original line number Diff line number Diff line
@@ -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,

drivers/staging/rtl8723au/os_dep/mlme_linux.c

+0 −6
Original line number Diff line number Diff line
@@ -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)

drivers/staging/rtl8723au/os_dep/usb_intf.c

+2 −1
Original line number Diff line number Diff line
@@ -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);