|
@@ -828,29 +828,6 @@ inline void rtw_indicate_scan_done(struct adapter *padapter, bool aborted)
|
|
|
rtw_os_indicate_scan_done(padapter, aborted);
|
|
|
}
|
|
|
|
|
|
-void rtw_scan_abort(struct adapter *adapter)
|
|
|
-{
|
|
|
- unsigned long start;
|
|
|
- struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
|
|
|
- struct mlme_ext_priv *pmlmeext = &(adapter->mlmeextpriv);
|
|
|
-
|
|
|
- start = jiffies;
|
|
|
- pmlmeext->scan_abort = true;
|
|
|
- while (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) &&
|
|
|
- jiffies_to_msecs(jiffies - start) <= 200) {
|
|
|
- if (adapter->bDriverStopped || adapter->bSurpriseRemoved)
|
|
|
- break;
|
|
|
- DBG_88E(FUNC_NDEV_FMT"fw_state=_FW_UNDER_SURVEY!\n", FUNC_NDEV_ARG(adapter->pnetdev));
|
|
|
- msleep(20);
|
|
|
- }
|
|
|
- if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) {
|
|
|
- if (!adapter->bDriverStopped && !adapter->bSurpriseRemoved)
|
|
|
- DBG_88E(FUNC_NDEV_FMT"waiting for scan_abort time out!\n", FUNC_NDEV_ARG(adapter->pnetdev));
|
|
|
- rtw_indicate_scan_done(adapter, true);
|
|
|
- }
|
|
|
- pmlmeext->scan_abort = false;
|
|
|
-}
|
|
|
-
|
|
|
static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, struct wlan_network *pnetwork)
|
|
|
{
|
|
|
int i;
|