summaryrefslogtreecommitdiff
path: root/drivers/staging/rtl8723au/core/rtw_mlme.c
diff options
context:
space:
mode:
authorJes Sorensen <Jes.Sorensen@redhat.com>2014-06-09 15:16:56 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-18 14:04:23 -0700
commit66ed1bc999eaa4357bd2d7098386e2284439098c (patch)
treef3aa47db5af1672e1f43ad7592dcbb6f96d3a52c /drivers/staging/rtl8723au/core/rtw_mlme.c
parente5c4db0959fd604baf95508e5ac6c62b72bf2c7a (diff)
staging: rtl8723au: rtw_surveydone_event_callback23a(): We always set _FW_UNDER_LINKING
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8723au/core/rtw_mlme.c')
-rw-r--r--drivers/staging/rtl8723au/core/rtw_mlme.c4
1 files changed, 1 insertions, 3 deletions
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);