From: Jes Sorensen Date: Mon, 9 Jun 2014 13:16:56 +0000 (+0200) Subject: staging: rtl8723au: rtw_surveydone_event_callback23a(): We always set _FW_UNDER_LINKING X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=66ed1bc999eaa4357bd2d7098386e2284439098c;p=openwrt%2Fstaging%2Fblogic.git staging: rtl8723au: rtw_surveydone_event_callback23a(): We always set _FW_UNDER_LINKING Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c index 06dc89796aaa..d2b38f7abca3 100644 --- a/drivers/staging/rtl8723au/core/rtw_mlme.c +++ b/drivers/staging/rtl8723au/core/rtw_mlme.c @@ -732,15 +732,13 @@ rtw_surveydone_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf) rtw_set_signal_stat_timer(&adapter->recvpriv); if (pmlmepriv->to_join == true) { + set_fwstate(pmlmepriv, _FW_UNDER_LINKING); if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { - set_fwstate(pmlmepriv, _FW_UNDER_LINKING); - ret = rtw_select_and_join_from_scanned_queue23a( pmlmepriv); if (ret != _SUCCESS) rtw_do_join_adhoc(adapter); } else { - set_fwstate(pmlmepriv, _FW_UNDER_LINKING); pmlmepriv->to_join = false; ret = rtw_select_and_join_from_scanned_queue23a( pmlmepriv);