shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-02 01:06:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

staging: rtl8723au: Move rtw_do_join23a() to rtw_mlme.c and declare it static

Browse Source 
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:17:00 +02:00
committed by Greg Kroah-Hartman
parent e89c05505f
commit e007b4c77c
3 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/staging/rtl8723au/core/rtw_ioctl_set.c
View File

@@ -22,39 +22,6 @@
#include <usb_ops.h>
#include <linux/ieee80211.h>
int rtw_do_join23a(struct rtw_adapter *padapter)
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
int ret;
pmlmepriv->cur_network.join_res = -2;
set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
pmlmepriv->to_join = true;
ret = rtw_select_and_join_from_scanned_queue23a(pmlmepriv);
if (ret == _SUCCESS) {
pmlmepriv->to_join = false;
} else {
if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {
/* switch to ADHOC_MASTER */
ret = rtw_do_join_adhoc(padapter);
if (ret != _SUCCESS)
goto exit;
} else {
/* can't associate ; reset under-linking */
_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
ret = _FAIL;
pmlmepriv->to_join = false;
}
}
exit:
return ret;
}
int rtw_set_802_11_bssid23a_list_scan(struct rtw_adapter *padapter,
struct cfg80211_ssid *pssid,
int ssid_max_num)

38
drivers/staging/rtl8723au/core/rtw_mlme.c
View File

@@ -29,6 +29,7 @@
static struct wlan_network *
rtw_select_candidate_from_queue(struct mlme_priv *pmlmepriv);
static int rtw_do_join(struct rtw_adapter *padapter);
static void rtw_init_mlme_timer(struct rtw_adapter *padapter)
{
@@ -280,7 +281,7 @@ static void _rtw_roaming(struct rtw_adapter *padapter,
pmlmepriv->assoc_by_bssid = false;
while (1) {
do_join_r = rtw_do_join23a(padapter);
do_join_r = rtw_do_join(padapter);
if (do_join_r == _SUCCESS)
break;
else {
@@ -1489,7 +1490,7 @@ void rtw23a_join_to_handler (unsigned long data)
if (adapter->mlmepriv.to_roaming != 0) {
/* try another */
DBG_8723A("%s try another roaming\n", __func__);
do_join_r = rtw_do_join23a(adapter);
do_join_r = rtw_do_join(adapter);
if (do_join_r != _SUCCESS) {
DBG_8723A("%s roaming do_join return "
"%d\n", __func__ , do_join_r);
@@ -1688,6 +1689,39 @@ pmlmepriv->lock
*/
static int rtw_do_join(struct rtw_adapter *padapter)
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
int ret;
pmlmepriv->cur_network.join_res = -2;
set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
pmlmepriv->to_join = true;
ret = rtw_select_and_join_from_scanned_queue23a(pmlmepriv);
if (ret == _SUCCESS) {
pmlmepriv->to_join = false;
} else {
if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {
/* switch to ADHOC_MASTER */
ret = rtw_do_join_adhoc(padapter);
if (ret != _SUCCESS)
goto exit;
} else {
/* can't associate ; reset under-linking */
_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
ret = _FAIL;
pmlmepriv->to_join = false;
}
}
exit:
return ret;
}
static struct wlan_network *
rtw_select_candidate_from_queue(struct mlme_priv *pmlmepriv)
{

1
drivers/staging/rtl8723au/include/rtw_ioctl_set.h
View File

@@ -23,6 +23,5 @@ int rtw_set_802_11_bssid23a_list_scan(struct rtw_adapter *padapter,
u16 rtw_get_cur_max_rate23a(struct rtw_adapter *adapter);
s32 FillH2CCmd(struct rtw_adapter *padapter, u8 ElementID, u32 CmdLen, u8 *pCmdBuffer);
int rtw_do_join23a(struct rtw_adapter *padapter);
#endif