staging: rtl8723au: rtw_surveydone_event_callback23a(): We always set _FW_UNDER_LINKING
authorJes Sorensen <Jes.Sorensen@redhat.com>
Mon, 9 Jun 2014 13:16:56 +0000 (15:16 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Jun 2014 21:04:23 +0000 (14:04 -0700)
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723au/core/rtw_mlme.c

index 06dc89796aaa1e784e2b47df8ed58c8fa278f9ea..d2b38f7abca3830e26e9e6c739269cd0276de9a8 100644 (file)
@@ -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);