diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2014-06-09 15:16:55 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-18 14:04:23 -0700 |
| commit | e5c4db0959fd604baf95508e5ac6c62b72bf2c7a (patch) | |
| tree | b29be17f3cc417350cdf4044fe53819e94a55054 /drivers/staging/rtl8723au | |
| parent | 3221bb536d92967ac204424140699a4fc23e0ac5 (diff) | |
| download | op-kernel-dev-e5c4db0959fd604baf95508e5ac6c62b72bf2c7a.zip op-kernel-dev-e5c4db0959fd604baf95508e5ac6c62b72bf2c7a.tar.gz | |
staging: rtl8723au: to_join will no be true if _FW_LINKED is set
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8723au')
| -rw-r--r-- | drivers/staging/rtl8723au/core/rtw_mlme.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c index efb2161..06dc897 100644 --- a/drivers/staging/rtl8723au/core/rtw_mlme.c +++ b/drivers/staging/rtl8723au/core/rtw_mlme.c @@ -705,6 +705,7 @@ rtw_surveydone_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf) { struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; + int ret; spin_lock_bh(&pmlmepriv->lock); @@ -732,15 +733,13 @@ rtw_surveydone_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf) if (pmlmepriv->to_join == true) { if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { - if (!check_fwstate(pmlmepriv, _FW_LINKED)) { - set_fwstate(pmlmepriv, _FW_UNDER_LINKING); + set_fwstate(pmlmepriv, _FW_UNDER_LINKING); - if (rtw_select_and_join_from_scanned_queue23a( - pmlmepriv) != _SUCCESS) - rtw_do_join_adhoc(adapter); - } + ret = rtw_select_and_join_from_scanned_queue23a( + pmlmepriv); + if (ret != _SUCCESS) + rtw_do_join_adhoc(adapter); } else { - int ret; set_fwstate(pmlmepriv, _FW_UNDER_LINKING); pmlmepriv->to_join = false; ret = rtw_select_and_join_from_scanned_queue23a( |
