forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

staging: rtl8723au: rtw_set_ssid(): Use rtw_do_join_network()

Browse source 
We already have the wlan_network we wish to join, hence it's pointless
to go back to the scanned_queue and pull it out of there, before
running the join logic.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2014-06-09 15:16:58 +02:00 • committed by Greg Kroah-Hartman
commit 72795e9de7
1 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

25
drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
View file

@ -2099,11 +2099,28 @@ handle_tkip_countermeasure:
pmlmepriv->assoc_by_bssid = false;
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY))
pmlmepriv->to_join = true;
else
status = rtw_do_join23a(padapter);
pmlmepriv->to_join = true;
if (!check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) {
pmlmepriv->cur_network.join_res = -2;
status = rtw_do_join_network(padapter, newnetwork);
if (status == _SUCCESS) {
pmlmepriv->to_join = false;
} else {
if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {
/* switch to ADHOC_MASTER */
status = rtw_do_join_adhoc(padapter);
if (status != _SUCCESS)
goto release_mlme_lock;
} else {
/* can't associate ; reset under-linking */
_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
status = _FAIL;
pmlmepriv->to_join = false;
}
}
}
release_mlme_lock:
spin_unlock_bh(&pmlmepriv->lock);