|
@@ -425,7 +425,7 @@ static void update_current_network(struct rtw_adapter *adapter,
|
|
|
if (check_fwstate(pmlmepriv, _FW_LINKED) &&
|
|
|
is_same_network23a(&pmlmepriv->cur_network.network, pnetwork)) {
|
|
|
update_network23a(&pmlmepriv->cur_network.network,
|
|
|
- pnetwork,adapter, true);
|
|
|
+ pnetwork, adapter, true);
|
|
|
|
|
|
rtw_update_protection23a(adapter,
|
|
|
pmlmepriv->cur_network.network.IEs,
|
|
@@ -510,7 +510,7 @@ static void rtw_update_scanned_network(struct rtw_adapter *adapter,
|
|
|
target->reserved == 1)
|
|
|
update_ie = false;
|
|
|
|
|
|
- update_network23a(&pnetwork->network, target,adapter,
|
|
|
+ update_network23a(&pnetwork->network, target, adapter,
|
|
|
update_ie);
|
|
|
}
|
|
|
|
|
@@ -577,7 +577,8 @@ static int rtw_is_desired_network(struct rtw_adapter *adapter,
|
|
|
/* TODO: Perry : For Power Management */
|
|
|
void rtw_atimdone_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf)
|
|
|
{
|
|
|
- RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("receive atimdone_evet\n"));
|
|
|
+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,
|
|
|
+ ("receive atimdone_evet\n"));
|
|
|
|
|
|
return;
|
|
|
}
|
|
@@ -591,12 +592,12 @@ void rtw_survey_event_cb23a(struct rtw_adapter *adapter, const u8 *pbuf)
|
|
|
|
|
|
pnetwork = survey->bss;
|
|
|
|
|
|
- RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,
|
|
|
+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
|
|
|
("rtw_survey_event_cb23a, ssid=%s\n", pnetwork->Ssid.ssid));
|
|
|
|
|
|
len = get_wlan_bssid_ex_sz(pnetwork);
|
|
|
if (len > (sizeof(struct wlan_bssid_ex))) {
|
|
|
- RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,
|
|
|
+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,
|
|
|
("\n ****rtw_survey_event_cb23a: return a wrong "
|
|
|
"bss ***\n"));
|
|
|
return;
|
|
@@ -796,7 +797,7 @@ void rtw_free_assoc_resources23a(struct rtw_adapter *adapter,
|
|
|
if (pwlan)
|
|
|
pwlan->fixed = false;
|
|
|
else
|
|
|
- RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,
|
|
|
+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,
|
|
|
("rtw_free_assoc_resources23a : pwlan== NULL\n"));
|
|
|
|
|
|
if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) &&
|
|
@@ -1094,15 +1095,15 @@ void rtw_joinbss_event_prehandle23a(struct rtw_adapter *adapter, u8 *pbuf)
|
|
|
struct wlan_network *pcur_wlan, *ptarget_wlan = NULL;
|
|
|
bool the_same_macaddr;
|
|
|
|
|
|
- RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,
|
|
|
+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
|
|
|
("joinbss event call back received with res=%d\n",
|
|
|
pnetwork->join_res));
|
|
|
|
|
|
if (pmlmepriv->assoc_ssid.ssid_len == 0) {
|
|
|
- RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,
|
|
|
+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,
|
|
|
("@@@@@ joinbss event call back for Any SSid\n"));
|
|
|
} else {
|
|
|
- RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,
|
|
|
+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,
|
|
|
("@@@@@ rtw23a_joinbss_event_cb for SSid:%s\n",
|
|
|
pmlmepriv->assoc_ssid.ssid));
|
|
|
}
|
|
@@ -1115,7 +1116,7 @@ void rtw_joinbss_event_prehandle23a(struct rtw_adapter *adapter, u8 *pbuf)
|
|
|
|
|
|
pnetwork->network.Length = get_wlan_bssid_ex_sz(&pnetwork->network);
|
|
|
if (pnetwork->network.Length > sizeof(struct wlan_bssid_ex)) {
|
|
|
- RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,
|
|
|
+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,
|
|
|
("\n\n ***joinbss_evt_callback return a wrong bss "
|
|
|
"***\n\n"));
|
|
|
return;
|
|
@@ -1123,12 +1124,12 @@ void rtw_joinbss_event_prehandle23a(struct rtw_adapter *adapter, u8 *pbuf)
|
|
|
|
|
|
spin_lock_bh(&pmlmepriv->lock);
|
|
|
|
|
|
- RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,
|
|
|
+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
|
|
|
("\n rtw23a_joinbss_event_cb !! _enter_critical\n"));
|
|
|
|
|
|
if (pnetwork->join_res > 0) {
|
|
|
spin_lock_bh(&pmlmepriv->scanned_queue.lock);
|
|
|
- if (check_fwstate(pmlmepriv,_FW_UNDER_LINKING)) {
|
|
|
+ if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) {
|
|
|
/* s1. find ptarget_wlan */
|
|
|
if (check_fwstate(pmlmepriv, _FW_LINKED)) {
|
|
|
if (the_same_macaddr == true) {
|
|
@@ -1172,7 +1173,7 @@ void rtw_joinbss_event_prehandle23a(struct rtw_adapter *adapter, u8 *pbuf)
|
|
|
ptarget_wlan,
|
|
|
pnetwork);
|
|
|
else {
|
|
|
- RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,
|
|
|
+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,
|
|
|
("Can't find ptarget_wlan when "
|
|
|
"joinbss_event callback\n"));
|
|
|
spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
|
|
@@ -1200,7 +1201,7 @@ void rtw_joinbss_event_prehandle23a(struct rtw_adapter *adapter, u8 *pbuf)
|
|
|
else {
|
|
|
/* adhoc mode will rtw_indicate_connect23a
|
|
|
when rtw_stassoc_event_callback23a */
|
|
|
- RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,
|
|
|
+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
|
|
|
("adhoc mode, fw_state:%x",
|
|
|
get_fwstate(pmlmepriv)));
|
|
|
}
|
|
@@ -1208,7 +1209,7 @@ void rtw_joinbss_event_prehandle23a(struct rtw_adapter *adapter, u8 *pbuf)
|
|
|
/* s5. Cancle assoc_timer */
|
|
|
del_timer_sync(&pmlmepriv->assoc_timer);
|
|
|
|
|
|
- RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,
|
|
|
+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
|
|
|
("Cancle assoc_timer\n"));
|
|
|
} else {
|
|
|
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,
|
|
@@ -1278,7 +1279,7 @@ void rtw_stassoc_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf)
|
|
|
psta = rtw_get_stainfo23a(&adapter->stapriv, pstassoc->macaddr);
|
|
|
if (psta != NULL) {
|
|
|
/* the sta have been in sta_info_queue => do nothing */
|
|
|
- RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,
|
|
|
+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,
|
|
|
("Error: rtw_stassoc_event_callback23a: sta has "
|
|
|
"been in sta_hash_queue\n"));
|
|
|
/* between drv has received this event before and
|
|
@@ -1289,7 +1290,7 @@ void rtw_stassoc_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf)
|
|
|
psta = rtw_alloc_stainfo23a(&adapter->stapriv, pstassoc->macaddr,
|
|
|
GFP_KERNEL);
|
|
|
if (!psta) {
|
|
|
- RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,
|
|
|
+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,
|
|
|
("Can't alloc sta_info when "
|
|
|
"rtw_stassoc_event_callback23a\n"));
|
|
|
return;
|
|
@@ -1299,7 +1300,7 @@ void rtw_stassoc_event_callback23a(struct rtw_adapter *adapter, const u8 *pbuf)
|
|
|
psta->qos_option = 0;
|
|
|
psta->mac_id = (uint)pstassoc->cam_id;
|
|
|
/* psta->aid = (uint)pstassoc->cam_id; */
|
|
|
- DBG_8723A("%s\n",__func__);
|
|
|
+ DBG_8723A("%s\n", __func__);
|
|
|
/* for ad-hoc mode */
|
|
|
rtl8723a_SetHalODMVar(adapter, HAL_ODM_STA_INFO, psta, true);
|
|
|
|
|
@@ -1794,7 +1795,7 @@ int rtw_set_auth23a(struct rtw_adapter * adapter,
|
|
|
pcmd->rsp = NULL;
|
|
|
pcmd->rspsz = 0;
|
|
|
|
|
|
- RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,
|
|
|
+ RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,
|
|
|
("after enqueue set_auth_cmd, auth_mode=%x\n",
|
|
|
psecuritypriv->dot11AuthAlgrthm));
|
|
|
|