mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-06-23 08:34:20 +00:00
rtl8188eu: Change C90 comments to kernel form for files in core/
This commit also includes some sparse fixes for endian issues. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
parent
fb786d0283
commit
d2c90ee304
24 changed files with 4667 additions and 5077 deletions
275
core/rtw_cmd.c
275
core/rtw_cmd.c
|
|
@ -27,12 +27,12 @@
|
|||
#include <mlme_osdep.h>
|
||||
#ifdef CONFIG_BR_EXT
|
||||
#include <rtw_br_ext.h>
|
||||
#endif //CONFIG_BR_EXT
|
||||
#endif /* CONFIG_BR_EXT */
|
||||
#include <rtw_mlme_ext.h>
|
||||
|
||||
#ifdef CONFIG_BT_COEXIST
|
||||
#include <rtl8723a_hal.h>
|
||||
#endif // CONFIG_BT_COEXIST
|
||||
#endif /* CONFIG_BT_COEXIST */
|
||||
|
||||
/*
|
||||
Caller and the rtw_cmd_thread can protect cmd_q by spin_lock.
|
||||
|
|
@ -46,13 +46,13 @@ sint _rtw_init_cmd_priv (struct cmd_priv *pcmdpriv)
|
|||
_func_enter_;
|
||||
|
||||
_rtw_init_sema(&(pcmdpriv->cmd_queue_sema), 0);
|
||||
//_rtw_init_sema(&(pcmdpriv->cmd_done_sema), 0);
|
||||
/* _rtw_init_sema(&(pcmdpriv->cmd_done_sema), 0); */
|
||||
_rtw_init_sema(&(pcmdpriv->terminate_cmdthread_sema), 0);
|
||||
|
||||
|
||||
_rtw_init_queue(&(pcmdpriv->cmd_queue));
|
||||
|
||||
//allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf
|
||||
/* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */
|
||||
|
||||
pcmdpriv->cmd_seq = 1;
|
||||
|
||||
|
|
@ -100,7 +100,7 @@ _func_enter_;
|
|||
pevtpriv->cmdevt_parm = NULL;
|
||||
#endif
|
||||
|
||||
//allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf
|
||||
/* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */
|
||||
ATOMIC_SET(&pevtpriv->event_seq, 0);
|
||||
pevtpriv->evt_done_cnt = 0;
|
||||
|
||||
|
|
@ -136,13 +136,13 @@ _func_enter_;
|
|||
}
|
||||
MmBuildMdlForNonPagedPool(pevtpriv->pc2h_mdl);
|
||||
#endif
|
||||
#endif //end of CONFIG_SDIO_HCI
|
||||
#endif /* end of CONFIG_SDIO_HCI */
|
||||
|
||||
_rtw_init_queue(&(pevtpriv->evt_queue));
|
||||
|
||||
exit:
|
||||
|
||||
#endif //end of CONFIG_EVENT_THREAD_MODE
|
||||
#endif /* end of CONFIG_EVENT_THREAD_MODE */
|
||||
|
||||
#ifdef CONFIG_C2H_WK
|
||||
_init_workitem(&pevtpriv->c2h_wk, c2h_wk_callback, NULL);
|
||||
|
|
@ -197,7 +197,7 @@ _func_enter_;
|
|||
if (pcmdpriv){
|
||||
_rtw_spinlock_free(&(pcmdpriv->cmd_queue.lock));
|
||||
_rtw_free_sema(&(pcmdpriv->cmd_queue_sema));
|
||||
//_rtw_free_sema(&(pcmdpriv->cmd_done_sema));
|
||||
/* _rtw_free_sema(&(pcmdpriv->cmd_done_sema)); */
|
||||
_rtw_free_sema(&(pcmdpriv->terminate_cmdthread_sema));
|
||||
|
||||
if (pcmdpriv->cmd_allocated_buf)
|
||||
|
|
@ -228,12 +228,12 @@ _func_enter_;
|
|||
if (obj == NULL)
|
||||
goto exit;
|
||||
|
||||
//_enter_critical_bh(&queue->lock, &irqL);
|
||||
/* _enter_critical_bh(&queue->lock, &irqL); */
|
||||
_enter_critical(&queue->lock, &irqL);
|
||||
|
||||
rtw_list_insert_tail(&obj->list, &queue->queue);
|
||||
|
||||
//_exit_critical_bh(&queue->lock, &irqL);
|
||||
/* _exit_critical_bh(&queue->lock, &irqL); */
|
||||
_exit_critical(&queue->lock, &irqL);
|
||||
|
||||
exit:
|
||||
|
|
@ -250,7 +250,7 @@ struct cmd_obj *_rtw_dequeue_cmd(_queue *queue)
|
|||
|
||||
_func_enter_;
|
||||
|
||||
//_enter_critical_bh(&(queue->lock), &irqL);
|
||||
/* _enter_critical_bh(&(queue->lock), &irqL); */
|
||||
_enter_critical(&queue->lock, &irqL);
|
||||
if (rtw_is_list_empty(&(queue->queue)))
|
||||
obj = NULL;
|
||||
|
|
@ -260,7 +260,7 @@ _func_enter_;
|
|||
rtw_list_delete(&obj->list);
|
||||
}
|
||||
|
||||
//_exit_critical_bh(&(queue->lock), &irqL);
|
||||
/* _exit_critical_bh(&(queue->lock), &irqL); */
|
||||
_exit_critical(&queue->lock, &irqL);
|
||||
|
||||
_func_exit_;
|
||||
|
|
@ -305,10 +305,10 @@ _func_exit_;
|
|||
int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj);
|
||||
int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
|
||||
{
|
||||
u8 bAllow = false; //set to true to allow enqueuing cmd when hw_init_completed is false
|
||||
u8 bAllow = false; /* set to true to allow enqueuing cmd when hw_init_completed is false */
|
||||
|
||||
#ifdef SUPPORT_HW_RFOFF_DETECTED
|
||||
//To decide allow or not
|
||||
/* To decide allow or not */
|
||||
if ( (pcmdpriv->padapter->pwrctrlpriv.bHWPwrPindetect)
|
||||
&&(!pcmdpriv->padapter->registrypriv.usbss_enable)
|
||||
)
|
||||
|
|
@ -318,7 +318,7 @@ int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
|
|||
struct drvextra_cmd_parm *pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)cmd_obj->parmbuf;
|
||||
if (pdrvextra_cmd_parm->ec_id == POWER_SAVING_CTRL_WK_CID)
|
||||
{
|
||||
//DBG_88E("==>enqueue POWER_SAVING_CTRL_WK_CID\n");
|
||||
/* DBG_88E("==>enqueue POWER_SAVING_CTRL_WK_CID\n"); */
|
||||
bAllow = true;
|
||||
}
|
||||
}
|
||||
|
|
@ -329,14 +329,14 @@ int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
|
|||
bAllow = true;
|
||||
|
||||
if ( (pcmdpriv->padapter->hw_init_completed ==false && bAllow == false)
|
||||
|| pcmdpriv->cmdthd_running== false //com_thread not running
|
||||
|| pcmdpriv->cmdthd_running== false /* com_thread not running */
|
||||
)
|
||||
{
|
||||
//DBG_88E("%s:%s: drop cmdcode:%u, hw_init_completed:%u, cmdthd_running:%u\n", caller_func, __func__,
|
||||
// cmd_obj->cmdcode,
|
||||
// pcmdpriv->padapter->hw_init_completed,
|
||||
// pcmdpriv->cmdthd_running
|
||||
//);
|
||||
/* DBG_88E("%s:%s: drop cmdcode:%u, hw_init_completed:%u, cmdthd_running:%u\n", caller_func, __func__, */
|
||||
/* cmd_obj->cmdcode, */
|
||||
/* pcmdpriv->padapter->hw_init_completed, */
|
||||
/* pcmdpriv->cmdthd_running */
|
||||
/* */
|
||||
|
||||
return _FAIL;
|
||||
}
|
||||
|
|
@ -396,7 +396,7 @@ void rtw_cmd_clr_isr(struct cmd_priv *pcmdpriv)
|
|||
{
|
||||
_func_enter_;
|
||||
pcmdpriv->cmd_done_cnt++;
|
||||
//_rtw_up_sema(&(pcmdpriv->cmd_done_sema));
|
||||
/* _rtw_up_sema(&(pcmdpriv->cmd_done_sema)); */
|
||||
_func_exit_;
|
||||
}
|
||||
|
||||
|
|
@ -406,7 +406,7 @@ _func_enter_;
|
|||
|
||||
if ((pcmd->cmdcode!=_JoinBss_CMD_) &&(pcmd->cmdcode!= _CreateBss_CMD_))
|
||||
{
|
||||
//free parmbuf in cmd_obj
|
||||
/* free parmbuf in cmd_obj */
|
||||
rtw_mfree((unsigned char*)pcmd->parmbuf, pcmd->cmdsz);
|
||||
}
|
||||
|
||||
|
|
@ -414,12 +414,12 @@ _func_enter_;
|
|||
{
|
||||
if (pcmd->rspsz!= 0)
|
||||
{
|
||||
//free rsp in cmd_obj
|
||||
/* free rsp in cmd_obj */
|
||||
rtw_mfree((unsigned char*)pcmd->rsp, pcmd->rspsz);
|
||||
}
|
||||
}
|
||||
|
||||
//free cmd_obj
|
||||
/* free cmd_obj */
|
||||
rtw_mfree((unsigned char*)pcmd, sizeof(struct cmd_obj));
|
||||
|
||||
_func_exit_;
|
||||
|
|
@ -490,7 +490,7 @@ _next:
|
|||
|
||||
pcmdpriv->cmd_issued_cnt++;
|
||||
|
||||
pcmd->cmdsz = _RND4((pcmd->cmdsz));//_RND4
|
||||
pcmd->cmdsz = _RND4((pcmd->cmdsz));/* _RND4 */
|
||||
|
||||
_rtw_memcpy(pcmdbuf, pcmd->parmbuf, pcmd->cmdsz);
|
||||
|
||||
|
|
@ -515,7 +515,7 @@ _next:
|
|||
|
||||
post_process:
|
||||
|
||||
//call callback function for post-processed
|
||||
/* call callback function for post-processed */
|
||||
if (pcmd->cmdcode <= (sizeof(rtw_cmd_callback) /sizeof(struct _cmd_callback)))
|
||||
{
|
||||
pcmd_callback = rtw_cmd_callback[pcmd->cmdcode].callback;
|
||||
|
|
@ -526,8 +526,8 @@ post_process:
|
|||
}
|
||||
else
|
||||
{
|
||||
//todo: !!! fill rsp_buf to pcmd->rsp if (pcmd->rsp!=NULL)
|
||||
pcmd_callback(pcmd->padapter, pcmd);//need conider that free cmd_obj in rtw_cmd_callback
|
||||
/* todo: !!! fill rsp_buf to pcmd->rsp if (pcmd->rsp!=NULL) */
|
||||
pcmd_callback(pcmd->padapter, pcmd);/* need conider that free cmd_obj in rtw_cmd_callback */
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
@ -544,13 +544,13 @@ post_process:
|
|||
pcmdpriv->cmdthd_running=false;
|
||||
|
||||
|
||||
// free all cmd_obj resources
|
||||
/* free all cmd_obj resources */
|
||||
do{
|
||||
pcmd = rtw_dequeue_cmd(pcmdpriv);
|
||||
if (pcmd==NULL)
|
||||
break;
|
||||
|
||||
//DBG_88E("%s: leaving... drop cmdcode:%u\n", __func__, pcmd->cmdcode);
|
||||
/* DBG_88E("%s: leaving... drop cmdcode:%u\n", __func__, pcmd->cmdcode); */
|
||||
|
||||
rtw_free_cmd_obj(pcmd);
|
||||
}while (1);
|
||||
|
|
@ -586,7 +586,7 @@ _func_enter_;
|
|||
|
||||
_exit_critical_bh(&queue->lock, &irqL);
|
||||
|
||||
//rtw_evt_notify_isr(pevtpriv);
|
||||
/* rtw_evt_notify_isr(pevtpriv); */
|
||||
|
||||
exit:
|
||||
|
||||
|
|
@ -695,7 +695,7 @@ u8 rtw_sitesurvey_cmd(_adapter *padapter, NDIS_802_11_SSID *ssid, int ssid_num,
|
|||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
#ifdef CONFIG_P2P
|
||||
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
|
||||
#endif //CONFIG_P2P
|
||||
#endif /* CONFIG_P2P */
|
||||
|
||||
_func_enter_;
|
||||
|
||||
|
|
@ -709,7 +709,7 @@ _func_enter_;
|
|||
if (check_fwstate(pmlmepriv, _FW_LINKED) == true) {
|
||||
p2p_ps_wk_cmd(padapter, P2P_PS_SCAN, 1);
|
||||
}
|
||||
#endif //CONFIG_P2P_PS
|
||||
#endif /* CONFIG_P2P_PS */
|
||||
|
||||
ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
|
||||
if (ph2c == NULL)
|
||||
|
|
@ -770,12 +770,12 @@ _func_enter_;
|
|||
if ((padapter->pbuddy_adapter->mlmeextpriv.mlmext_info.state&0x03) == WIFI_FW_AP_STATE)
|
||||
_set_timer(&pmlmepriv->scan_to_timer, SURVEY_TO * ( 38 + ( 38 / RTW_SCAN_NUM_OF_CH ) * RTW_STAY_AP_CH_MILLISECOND ) + 1000 );
|
||||
else
|
||||
#endif //CONFIG_STA_MODE_SCAN_UNDER_AP_MODE
|
||||
#endif /* CONFIG_STA_MODE_SCAN_UNDER_AP_MODE */
|
||||
_set_timer(&pmlmepriv->scan_to_timer, SCANNING_TIMEOUT);
|
||||
|
||||
rtw_led_control(padapter, LED_CTL_SITE_SURVEY);
|
||||
|
||||
pmlmepriv->scan_interval = SCAN_INTERVAL;// 30*2 sec = 60sec
|
||||
pmlmepriv->scan_interval = SCAN_INTERVAL;/* 30*2 sec = 60sec */
|
||||
} else {
|
||||
_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY);
|
||||
}
|
||||
|
|
@ -810,7 +810,7 @@ _func_enter_;
|
|||
init_h2fwcmd_w_parm_no_rsp(ph2c, pbsetdataratepara, GEN_CMD_CODE(_SetDataRate));
|
||||
#ifdef MP_FIRMWARE_OFFLOAD
|
||||
pbsetdataratepara->curr_rateidx = *(u32*)rateset;
|
||||
// _rtw_memcpy(pbsetdataratepara, rateset, sizeof(u32));
|
||||
/* _rtw_memcpy(pbsetdataratepara, rateset, sizeof(u32)); */
|
||||
#else
|
||||
pbsetdataratepara->mac_id = 5;
|
||||
_rtw_memcpy(pbsetdataratepara->datarates, rateset, NumRates);
|
||||
|
|
@ -870,8 +870,8 @@ u8 rtw_setphy_cmd(_adapter *padapter, u8 modem, u8 ch)
|
|||
struct cmd_obj* ph2c;
|
||||
struct setphy_parm* psetphypara;
|
||||
struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
|
||||
// struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
// struct registry_priv* pregistry_priv = &padapter->registrypriv;
|
||||
/* struct mlme_priv *pmlmepriv = &padapter->mlmepriv; */
|
||||
/* struct registry_priv* pregistry_priv = &padapter->registrypriv; */
|
||||
u8 res=_SUCCESS;
|
||||
|
||||
_func_enter_;
|
||||
|
|
@ -1102,7 +1102,7 @@ _func_enter_;
|
|||
pdev_network->Length = pcmd->cmdsz;
|
||||
|
||||
#ifdef CONFIG_RTL8712
|
||||
//notes: translate IELength & Length after assign the Length to cmdsz;
|
||||
/* notes: translate IELength & Length after assign the Length to cmdsz; */
|
||||
pdev_network->Length = cpu_to_le32(pcmd->cmdsz);
|
||||
pdev_network->IELength = cpu_to_le32(pdev_network->IELength);
|
||||
pdev_network->Ssid.SsidLength = cpu_to_le32(pdev_network->Ssid.SsidLength);
|
||||
|
|
@ -1160,7 +1160,7 @@ u8 rtw_joinbss_cmd(_adapter *padapter, struct wlan_network* pnetwork)
|
|||
struct registry_priv *pregistrypriv = &padapter->registrypriv;
|
||||
#ifdef CONFIG_80211N_HT
|
||||
struct ht_priv *phtpriv = &pmlmepriv->htpriv;
|
||||
#endif //CONFIG_80211N_HT
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
NDIS_802_11_NETWORK_INFRASTRUCTURE ndis_network_mode = pnetwork->network.InfrastructureMode;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
|
|
@ -1181,19 +1181,11 @@ _func_enter_;
|
|||
RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("rtw_joinbss_cmd: memory allocate for cmd_obj fail!!!\n"));
|
||||
goto exit;
|
||||
}
|
||||
/* // for IEs is pointer
|
||||
t_len = sizeof (ULONG) + sizeof (NDIS_802_11_MAC_ADDRESS) + 2 +
|
||||
sizeof (NDIS_802_11_SSID) + sizeof (ULONG) +
|
||||
sizeof (NDIS_802_11_RSSI) + sizeof (NDIS_802_11_NETWORK_TYPE) +
|
||||
sizeof (NDIS_802_11_CONFIGURATION) +
|
||||
sizeof (NDIS_802_11_NETWORK_INFRASTRUCTURE) +
|
||||
sizeof (NDIS_802_11_RATES_EX)+ sizeof(WLAN_PHY_INFO)+ sizeof (ULONG) + MAX_IE_SZ;
|
||||
*/
|
||||
//for IEs is fix buf size
|
||||
/* for IEs is fix buf size */
|
||||
t_len = sizeof(WLAN_BSSID_EX);
|
||||
|
||||
|
||||
//for hidden ap to set fw_state here
|
||||
/* for hidden ap to set fw_state here */
|
||||
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != true)
|
||||
{
|
||||
switch (ndis_network_mode)
|
||||
|
|
@ -1240,10 +1232,10 @@ _func_enter_;
|
|||
}
|
||||
|
||||
psecnetwork->IELength = 0;
|
||||
// Added by Albert 2009/02/18
|
||||
// If the the driver wants to use the bssid to create the connection.
|
||||
// If not, we have to copy the connecting AP's MAC address to it so that
|
||||
// the driver just has the bssid information for PMKIDList searching.
|
||||
/* Added by Albert 2009/02/18 */
|
||||
/* If the the driver wants to use the bssid to create the connection. */
|
||||
/* If not, we have to copy the connecting AP's MAC address to it so that */
|
||||
/* the driver just has the bssid information for PMKIDList searching. */
|
||||
|
||||
if ( pmlmepriv->assoc_by_bssid == false )
|
||||
{
|
||||
|
|
@ -1264,11 +1256,11 @@ _func_enter_;
|
|||
if (psecnetwork->IELength != tmp_len)
|
||||
{
|
||||
psecnetwork->IELength = tmp_len;
|
||||
pqospriv->qos_option = 1; //There is WMM IE in this corresp. beacon
|
||||
pqospriv->qos_option = 1; /* There is WMM IE in this corresp. beacon */
|
||||
}
|
||||
else
|
||||
{
|
||||
pqospriv->qos_option = 0;//There is no WMM IE in this corresp. beacon
|
||||
pqospriv->qos_option = 0;/* There is no WMM IE in this corresp. beacon */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1276,14 +1268,14 @@ _func_enter_;
|
|||
phtpriv->ht_option = false;
|
||||
if (pregistrypriv->ht_enable)
|
||||
{
|
||||
// Added by Albert 2010/06/23
|
||||
// For the WEP mode, we will use the bg mode to do the connection to avoid some IOT issue.
|
||||
// Especially for Realtek 8192u SoftAP.
|
||||
/* Added by Albert 2010/06/23 */
|
||||
/* For the WEP mode, we will use the bg mode to do the connection to avoid some IOT issue. */
|
||||
/* Especially for Realtek 8192u SoftAP. */
|
||||
if ( ( padapter->securitypriv.dot11PrivacyAlgrthm != _WEP40_ ) &&
|
||||
( padapter->securitypriv.dot11PrivacyAlgrthm != _WEP104_ ) &&
|
||||
( padapter->securitypriv.dot11PrivacyAlgrthm != _TKIP_ ))
|
||||
{
|
||||
//rtw_restructure_ht_ie
|
||||
/* rtw_restructure_ht_ie */
|
||||
rtw_restructure_ht_ie(padapter, &pnetwork->network.IEs[0], &psecnetwork->IEs[0],
|
||||
pnetwork->network.IELength, &psecnetwork->IELength);
|
||||
}
|
||||
|
|
@ -1300,10 +1292,10 @@ _func_enter_;
|
|||
|
||||
DBG_88E("%s: smart_ps=%d\n", __func__, padapter->pwrctrlpriv.smart_ps);
|
||||
|
||||
pcmd->cmdsz = get_WLAN_BSSID_EX_sz(psecnetwork);//get cmdsz before endian conversion
|
||||
pcmd->cmdsz = get_WLAN_BSSID_EX_sz(psecnetwork);/* get cmdsz before endian conversion */
|
||||
|
||||
#ifdef CONFIG_RTL8712
|
||||
//wlan_network endian conversion
|
||||
/* wlan_network endian conversion */
|
||||
psecnetwork->Length = cpu_to_le32(psecnetwork->Length);
|
||||
psecnetwork->Ssid.SsidLength= cpu_to_le32(psecnetwork->Ssid.SsidLength);
|
||||
psecnetwork->Privacy = cpu_to_le32(psecnetwork->Privacy);
|
||||
|
|
@ -1322,7 +1314,7 @@ _func_enter_;
|
|||
#endif
|
||||
|
||||
_rtw_init_listhead(&pcmd->list);
|
||||
pcmd->cmdcode = _JoinBss_CMD_;//GEN_CMD_CODE(_JoinBss)
|
||||
pcmd->cmdcode = _JoinBss_CMD_;/* GEN_CMD_CODE(_JoinBss) */
|
||||
pcmd->parmbuf = (unsigned char *)psecnetwork;
|
||||
pcmd->rsp = NULL;
|
||||
pcmd->rspsz = 0;
|
||||
|
|
@ -1460,7 +1452,7 @@ _func_enter_;
|
|||
if (sta->tdls_sta_state&TDLS_LINKED_STATE)
|
||||
psetstakey_para->algorithm=(u8)sta->dot118021XPrivacy;
|
||||
else
|
||||
#endif //CONFIG_TDLS
|
||||
#endif /* CONFIG_TDLS */
|
||||
psetstakey_para->algorithm =(unsigned char) psecuritypriv->dot11PrivacyAlgrthm;
|
||||
}else{
|
||||
GET_ENCRY_ALGO(psecuritypriv, sta, psetstakey_para->algorithm, false);
|
||||
|
|
@ -1471,13 +1463,13 @@ _func_enter_;
|
|||
if ((sta->tdls_sta_state&TDLS_LINKED_STATE)==TDLS_LINKED_STATE)
|
||||
_rtw_memcpy(&psetstakey_para->key, sta->tpk.tk, 16);
|
||||
else
|
||||
#endif //CONFIG_TDLS
|
||||
#endif /* CONFIG_TDLS */
|
||||
_rtw_memcpy(&psetstakey_para->key, &sta->dot118021x_UncstKey, 16);
|
||||
} else {
|
||||
_rtw_memcpy(&psetstakey_para->key, &psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey, 16);
|
||||
}
|
||||
|
||||
//jeff: set this becasue at least sw key is ready
|
||||
/* jeff: set this becasue at least sw key is ready */
|
||||
padapter->securitypriv.busetkipkey=true;
|
||||
|
||||
res = rtw_enqueue_cmd(pcmdpriv, ph2c);
|
||||
|
|
@ -1603,7 +1595,7 @@ _func_enter_;
|
|||
goto exit;
|
||||
}
|
||||
|
||||
// init_h2fwcmd_w_parm_no_rsp(ph2c, psetrttblparm, GEN_CMD_CODE(_SetRaTable));
|
||||
/* init_h2fwcmd_w_parm_no_rsp(ph2c, psetrttblparm, GEN_CMD_CODE(_SetRaTable)); */
|
||||
|
||||
_rtw_init_listhead(&ph2c->list);
|
||||
ph2c->cmdcode =GEN_CMD_CODE(_GetRaTable);
|
||||
|
|
@ -1695,9 +1687,9 @@ _func_enter_;
|
|||
|
||||
init_h2fwcmd_w_parm_no_rsp(ph2c, paddbareq_parm, GEN_CMD_CODE(_AddBAReq));
|
||||
|
||||
//DBG_88E("rtw_addbareq_cmd, tid=%d\n", tid);
|
||||
/* DBG_88E("rtw_addbareq_cmd, tid=%d\n", tid); */
|
||||
|
||||
//rtw_enqueue_cmd(pcmdpriv, ph2c);
|
||||
/* rtw_enqueue_cmd(pcmdpriv, ph2c); */
|
||||
res = rtw_enqueue_cmd(pcmdpriv, ph2c);
|
||||
|
||||
exit:
|
||||
|
|
@ -1741,7 +1733,7 @@ _func_enter_;
|
|||
init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra));
|
||||
|
||||
|
||||
//rtw_enqueue_cmd(pcmdpriv, ph2c);
|
||||
/* rtw_enqueue_cmd(pcmdpriv, ph2c); */
|
||||
res = rtw_enqueue_cmd(pcmdpriv, ph2c);
|
||||
|
||||
exit:
|
||||
|
|
@ -1819,13 +1811,13 @@ _func_enter_;
|
|||
|
||||
RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_set_chplan_cmd\n"));
|
||||
|
||||
//check input parameter
|
||||
/* check input parameter */
|
||||
if (!rtw_is_channel_plan_valid(chplan)) {
|
||||
res = _FAIL;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
//prepare cmd parameter
|
||||
/* prepare cmd parameter */
|
||||
setChannelPlan_param = (struct SetChannelPlan_param *)rtw_zmalloc(sizeof(struct SetChannelPlan_param));
|
||||
if (setChannelPlan_param == NULL) {
|
||||
res= _FAIL;
|
||||
|
|
@ -1835,7 +1827,7 @@ _func_enter_;
|
|||
|
||||
if (enqueue)
|
||||
{
|
||||
//need enqueue, prepare cmd_obj and enqueue
|
||||
/* need enqueue, prepare cmd_obj and enqueue */
|
||||
pcmdobj = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
|
||||
if (pcmdobj == NULL){
|
||||
rtw_mfree((u8 *)setChannelPlan_param, sizeof(struct SetChannelPlan_param));
|
||||
|
|
@ -1848,14 +1840,14 @@ _func_enter_;
|
|||
}
|
||||
else
|
||||
{
|
||||
//no need to enqueue, do the cmd hdl directly and free cmd parameter
|
||||
/* no need to enqueue, do the cmd hdl directly and free cmd parameter */
|
||||
if ( H2C_SUCCESS !=set_chplan_hdl(padapter, (unsigned char *)setChannelPlan_param) )
|
||||
res = _FAIL;
|
||||
|
||||
rtw_mfree((u8 *)setChannelPlan_param, sizeof(struct SetChannelPlan_param));
|
||||
}
|
||||
|
||||
//do something based on res...
|
||||
/* do something based on res... */
|
||||
if (res == _SUCCESS)
|
||||
padapter->mlmepriv.ChannelPlan = chplan;
|
||||
|
||||
|
|
@ -1976,7 +1968,7 @@ _func_enter_;
|
|||
init_h2fwcmd_w_parm_no_rsp(pcmdobj, TDLSoption, GEN_CMD_CODE(_TDLS));
|
||||
res = rtw_enqueue_cmd(pcmdpriv, pcmdobj);
|
||||
|
||||
#endif //CONFIG_TDLS
|
||||
#endif /* CONFIG_TDLS */
|
||||
|
||||
exit:
|
||||
|
||||
|
|
@ -1999,11 +1991,11 @@ static void traffic_status_watchdog(_adapter *padapter)
|
|||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
#ifdef CONFIG_TDLS
|
||||
struct tdls_info *ptdlsinfo = &(padapter->tdlsinfo);
|
||||
#endif //CONFIG_TDLS
|
||||
#endif /* CONFIG_TDLS */
|
||||
|
||||
//
|
||||
// Determine if our traffic is busy now
|
||||
//
|
||||
/* */
|
||||
/* Determine if our traffic is busy now */
|
||||
/* */
|
||||
if ((check_fwstate(pmlmepriv, _FW_LINKED)== true)
|
||||
/*&& !MgntInitAdapterInProgress(pMgntInfo)*/)
|
||||
{
|
||||
|
|
@ -2011,10 +2003,10 @@ static void traffic_status_watchdog(_adapter *padapter)
|
|||
#ifdef CONFIG_BT_COEXIST
|
||||
if ( pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > 50 ||
|
||||
pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > 50 )
|
||||
#else // !CONFIG_BT_COEXIST
|
||||
#else /* !CONFIG_BT_COEXIST */
|
||||
if ( pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > 100 ||
|
||||
pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > 100 )
|
||||
#endif // !CONFIG_BT_COEXIST
|
||||
#endif /* !CONFIG_BT_COEXIST */
|
||||
{
|
||||
bBusyTraffic = true;
|
||||
|
||||
|
|
@ -2024,7 +2016,7 @@ static void traffic_status_watchdog(_adapter *padapter)
|
|||
bTxBusyTraffic = true;
|
||||
}
|
||||
|
||||
// Higher Tx/Rx data.
|
||||
/* Higher Tx/Rx data. */
|
||||
if ( pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > 4000 ||
|
||||
pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > 4000 )
|
||||
{
|
||||
|
|
@ -2050,26 +2042,26 @@ static void traffic_status_watchdog(_adapter *padapter)
|
|||
pmlmepriv->ftp_lock_flag = 0;
|
||||
rtw_unlock_suspend();
|
||||
}
|
||||
#endif //CONFIG_KEEP_FTP_TRANSMIT
|
||||
#endif /* CONFIG_KEEP_FTP_TRANSMIT */
|
||||
|
||||
#ifdef CONFIG_TDLS
|
||||
#ifdef CONFIG_TDLS_AUTOSETUP
|
||||
if ( ( ptdlsinfo->watchdog_count % TDLS_WATCHDOG_PERIOD ) == 0 ) //10 * 2sec, periodically sending
|
||||
if ( ( ptdlsinfo->watchdog_count % TDLS_WATCHDOG_PERIOD ) == 0 ) /* 10 * 2sec, periodically sending */
|
||||
issue_tdls_dis_req( padapter, NULL );
|
||||
ptdlsinfo->watchdog_count++;
|
||||
#endif //CONFIG_TDLS_AUTOSETUP
|
||||
#endif //CONFIG_TDLS
|
||||
#endif /* CONFIG_TDLS_AUTOSETUP */
|
||||
#endif /* CONFIG_TDLS */
|
||||
|
||||
#ifdef CONFIG_LPS
|
||||
#ifdef CONFIG_BT_COEXIST
|
||||
if (BT_1Ant(padapter) == false)
|
||||
#endif
|
||||
{
|
||||
// check traffic for powersaving.
|
||||
/* check traffic for powersaving. */
|
||||
if ( ((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod + pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) > 8 ) ||
|
||||
(pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 2) )
|
||||
{
|
||||
//DBG_88E("Tx = %d, Rx = %d\n",pmlmepriv->LinkDetectInfo.NumTxOkInPeriod,pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod);
|
||||
/* DBG_88E("Tx = %d, Rx = %d\n",pmlmepriv->LinkDetectInfo.NumTxOkInPeriod,pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod); */
|
||||
bEnterPS= false;
|
||||
}
|
||||
else
|
||||
|
|
@ -2077,7 +2069,7 @@ static void traffic_status_watchdog(_adapter *padapter)
|
|||
bEnterPS= true;
|
||||
}
|
||||
|
||||
// LeisurePS only work in infra mode.
|
||||
/* LeisurePS only work in infra mode. */
|
||||
if (bEnterPS)
|
||||
{
|
||||
LPS_Enter(padapter);
|
||||
|
|
@ -2087,7 +2079,7 @@ static void traffic_status_watchdog(_adapter *padapter)
|
|||
LPS_Leave(padapter);
|
||||
}
|
||||
}
|
||||
#endif // CONFIG_LPS
|
||||
#endif /* CONFIG_LPS */
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -2122,13 +2114,13 @@ void dynamic_chk_wk_hdl(_adapter *padapter, u8 *pbuf, int sz)
|
|||
expire_timeout_chk(padapter);
|
||||
}
|
||||
#endif
|
||||
#endif //CONFIG_ACTIVE_KEEP_ALIVE_CHECK
|
||||
#endif /* CONFIG_ACTIVE_KEEP_ALIVE_CHECK */
|
||||
|
||||
#ifdef DBG_CONFIG_ERROR_DETECT
|
||||
rtw_hal_sreset_xmit_status_check(padapter);
|
||||
#endif
|
||||
|
||||
//if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING|_FW_UNDER_SURVEY)==false)
|
||||
/* if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING|_FW_UNDER_SURVEY)==false) */
|
||||
{
|
||||
linked_status_chk(padapter);
|
||||
traffic_status_watchdog(padapter);
|
||||
|
|
@ -2136,12 +2128,12 @@ void dynamic_chk_wk_hdl(_adapter *padapter, u8 *pbuf, int sz)
|
|||
|
||||
rtw_hal_dm_watchdog(padapter);
|
||||
|
||||
//check_hw_pbc(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type_size);
|
||||
/* check_hw_pbc(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type_size); */
|
||||
|
||||
#ifdef CONFIG_BT_COEXIST
|
||||
//
|
||||
// BT-Coexist
|
||||
//
|
||||
/* */
|
||||
/* BT-Coexist */
|
||||
/* */
|
||||
BT_CoexistMechanism(padapter);
|
||||
#endif
|
||||
}
|
||||
|
|
@ -2166,26 +2158,26 @@ _func_enter_;
|
|||
switch (lps_ctrl_type)
|
||||
{
|
||||
case LPS_CTRL_SCAN:
|
||||
//DBG_88E("LPS_CTRL_SCAN\n");
|
||||
/* DBG_88E("LPS_CTRL_SCAN\n"); */
|
||||
#ifdef CONFIG_BT_COEXIST
|
||||
BT_WifiScanNotify(padapter, true);
|
||||
if (BT_1Ant(padapter) == false)
|
||||
#endif
|
||||
{
|
||||
if (check_fwstate(pmlmepriv, _FW_LINKED) == true)
|
||||
{ //connect
|
||||
{ /* connect */
|
||||
LPS_Leave(padapter);
|
||||
}
|
||||
}
|
||||
break;
|
||||
case LPS_CTRL_JOINBSS:
|
||||
//DBG_88E("LPS_CTRL_JOINBSS\n");
|
||||
/* DBG_88E("LPS_CTRL_JOINBSS\n"); */
|
||||
LPS_Leave(padapter);
|
||||
break;
|
||||
case LPS_CTRL_CONNECT:
|
||||
//DBG_88E("LPS_CTRL_CONNECT\n");
|
||||
mstatus = 1;//connect
|
||||
// Reset LPS Setting
|
||||
/* DBG_88E("LPS_CTRL_CONNECT\n"); */
|
||||
mstatus = 1;/* connect */
|
||||
/* Reset LPS Setting */
|
||||
padapter->pwrctrlpriv.LpsIdleCount = 0;
|
||||
rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_JOINBSSRPT, (u8 *)(&mstatus));
|
||||
#ifdef CONFIG_BT_COEXIST
|
||||
|
|
@ -2193,8 +2185,8 @@ _func_enter_;
|
|||
#endif
|
||||
break;
|
||||
case LPS_CTRL_DISCONNECT:
|
||||
//DBG_88E("LPS_CTRL_DISCONNECT\n");
|
||||
mstatus = 0;//disconnect
|
||||
/* DBG_88E("LPS_CTRL_DISCONNECT\n"); */
|
||||
mstatus = 0;/* disconnect */
|
||||
#ifdef CONFIG_BT_COEXIST
|
||||
BT_WifiMediaStatusNotify(padapter, mstatus);
|
||||
if (BT_1Ant(padapter) == false)
|
||||
|
|
@ -2205,7 +2197,7 @@ _func_enter_;
|
|||
rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_JOINBSSRPT, (u8 *)(&mstatus));
|
||||
break;
|
||||
case LPS_CTRL_SPECIAL_PACKET:
|
||||
//DBG_88E("LPS_CTRL_SPECIAL_PACKET\n");
|
||||
/* DBG_88E("LPS_CTRL_SPECIAL_PACKET\n"); */
|
||||
pwrpriv->DelayLPSLastTimeStamp = rtw_get_current_time();
|
||||
#ifdef CONFIG_BT_COEXIST
|
||||
BT_SpecialPacketNotify(padapter);
|
||||
|
|
@ -2216,7 +2208,7 @@ _func_enter_;
|
|||
}
|
||||
break;
|
||||
case LPS_CTRL_LEAVE:
|
||||
//DBG_88E("LPS_CTRL_LEAVE\n");
|
||||
/* DBG_88E("LPS_CTRL_LEAVE\n"); */
|
||||
#ifdef CONFIG_BT_COEXIST
|
||||
BT_LpsLeave(padapter);
|
||||
if (BT_1Ant(padapter) == false)
|
||||
|
|
@ -2238,13 +2230,13 @@ u8 rtw_lps_ctrl_wk_cmd(_adapter*padapter, u8 lps_ctrl_type, u8 enqueue)
|
|||
struct cmd_obj *ph2c;
|
||||
struct drvextra_cmd_parm *pdrvextra_cmd_parm;
|
||||
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
|
||||
//struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
|
||||
/* struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; */
|
||||
u8 res = _SUCCESS;
|
||||
|
||||
_func_enter_;
|
||||
|
||||
//if (!pwrctrlpriv->bLeisurePs)
|
||||
// return res;
|
||||
/* if (!pwrctrlpriv->bLeisurePs) */
|
||||
/* return res; */
|
||||
|
||||
if (enqueue)
|
||||
{
|
||||
|
|
@ -2415,8 +2407,8 @@ _func_enter_;
|
|||
}
|
||||
|
||||
pdrvextra_cmd_parm->ec_id = P2P_PROTO_WK_CID;
|
||||
pdrvextra_cmd_parm->type_size = intCmdType; // As the command tppe.
|
||||
pdrvextra_cmd_parm->pbuf = NULL; // Must be NULL here
|
||||
pdrvextra_cmd_parm->type_size = intCmdType; /* As the command tppe. */
|
||||
pdrvextra_cmd_parm->pbuf = NULL; /* Must be NULL here */
|
||||
|
||||
init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra));
|
||||
|
||||
|
|
@ -2429,7 +2421,7 @@ _func_exit_;
|
|||
return res;
|
||||
|
||||
}
|
||||
#endif //CONFIG_P2P
|
||||
#endif /* CONFIG_P2P */
|
||||
|
||||
u8 rtw_ps_cmd(_adapter*padapter)
|
||||
{
|
||||
|
|
@ -2488,8 +2480,8 @@ static void rtw_chk_hi_queue_hdl(_adapter *padapter)
|
|||
{
|
||||
u8 val = 0;
|
||||
|
||||
//while ((rtw_read32(padapter, 0x414)&0x00ffff00)!=0)
|
||||
//while ((rtw_read32(padapter, 0x414)&0x0000ff00)!=0)
|
||||
/* while ((rtw_read32(padapter, 0x414)&0x00ffff00)!=0) */
|
||||
/* while ((rtw_read32(padapter, 0x414)&0x0000ff00)!=0) */
|
||||
|
||||
rtw_hal_get_hwreg(padapter, HW_VAR_CHK_HI_QUEUE_EMPTY, &val);
|
||||
|
||||
|
|
@ -2512,7 +2504,7 @@ static void rtw_chk_hi_queue_hdl(_adapter *padapter)
|
|||
|
||||
update_beacon(padapter, _TIM_IE_, NULL, false);
|
||||
}
|
||||
else //re check again
|
||||
else /* re check again */
|
||||
{
|
||||
rtw_chk_hi_queue_cmd(padapter);
|
||||
}
|
||||
|
|
@ -2694,22 +2686,22 @@ u8 rtw_drvextra_cmd_hdl(_adapter *padapter, unsigned char *pbuf)
|
|||
case P2P_PS_WK_CID:
|
||||
p2p_ps_wk_hdl(padapter, pdrvextra_cmd->type_size);
|
||||
break;
|
||||
#endif // CONFIG_P2P_PS
|
||||
#endif /* CONFIG_P2P_PS */
|
||||
case P2P_PROTO_WK_CID:
|
||||
// Commented by Albert 2011/07/01
|
||||
// I used the type_size as the type command
|
||||
/* Commented by Albert 2011/07/01 */
|
||||
/* I used the type_size as the type command */
|
||||
p2p_protocol_wk_hdl( padapter, pdrvextra_cmd->type_size );
|
||||
break;
|
||||
#ifdef CONFIG_AP_MODE
|
||||
case CHECK_HIQ_WK_CID:
|
||||
rtw_chk_hi_queue_hdl(padapter);
|
||||
break;
|
||||
#endif //CONFIG_AP_MODE
|
||||
#endif /* CONFIG_AP_MODE */
|
||||
#ifdef CONFIG_INTEL_WIDI
|
||||
case INTEl_WIDI_WK_CID:
|
||||
intel_widi_wk_hdl(padapter, pdrvextra_cmd->type_size, pdrvextra_cmd->pbuf);
|
||||
break;
|
||||
#endif //CONFIG_INTEL_WIDI
|
||||
#endif /* CONFIG_INTEL_WIDI */
|
||||
|
||||
case C2H_WK_CID:
|
||||
c2h_evt_hdl(padapter, (struct c2h_evt_hdr *)pdrvextra_cmd->pbuf, NULL);
|
||||
|
|
@ -2735,8 +2727,8 @@ _func_enter_;
|
|||
|
||||
if (pcmd->res == H2C_DROPPED)
|
||||
{
|
||||
//TODO: cancel timer and do timeout handler directly...
|
||||
//need to make timeout handlerOS independent
|
||||
/* TODO: cancel timer and do timeout handler directly... */
|
||||
/* need to make timeout handlerOS independent */
|
||||
_set_timer(&pmlmepriv->scan_to_timer, 1);
|
||||
}
|
||||
else if (pcmd->res != H2C_SUCCESS) {
|
||||
|
|
@ -2744,7 +2736,7 @@ _func_enter_;
|
|||
RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\n ********Error: MgntActrtw_set_802_11_bssid_LIST_SCAN Fail ************\n\n."));
|
||||
}
|
||||
|
||||
// free cmd
|
||||
/* free cmd */
|
||||
rtw_free_cmd_obj(pcmd);
|
||||
|
||||
_func_exit_;
|
||||
|
|
@ -2767,11 +2759,11 @@ _func_enter_;
|
|||
goto exit;
|
||||
}
|
||||
#ifdef CONFIG_BR_EXT
|
||||
else //clear bridge database
|
||||
else /* clear bridge database */
|
||||
nat25_db_cleanup(padapter);
|
||||
#endif //CONFIG_BR_EXT
|
||||
#endif /* CONFIG_BR_EXT */
|
||||
|
||||
// free cmd
|
||||
/* free cmd */
|
||||
rtw_free_cmd_obj(pcmd);
|
||||
|
||||
exit:
|
||||
|
|
@ -2788,8 +2780,8 @@ _func_enter_;
|
|||
|
||||
if (pcmd->res == H2C_DROPPED)
|
||||
{
|
||||
//TODO: cancel timer and do timeout handler directly...
|
||||
//need to make timeout handlerOS independent
|
||||
/* TODO: cancel timer and do timeout handler directly... */
|
||||
/* need to make timeout handlerOS independent */
|
||||
_set_timer(&pmlmepriv->assoc_timer, 1);
|
||||
}
|
||||
else if (pcmd->res != H2C_SUCCESS)
|
||||
|
|
@ -2824,14 +2816,14 @@ _func_enter_;
|
|||
_cancel_timer(&pmlmepriv->assoc_timer, &timer_cancelled);
|
||||
|
||||
#ifdef CONFIG_FW_MLMLE
|
||||
//endian_convert
|
||||
/* endian_convert */
|
||||
pnetwork->Length = le32_to_cpu(pnetwork->Length);
|
||||
pnetwork->Ssid.SsidLength = le32_to_cpu(pnetwork->Ssid.SsidLength);
|
||||
pnetwork->Privacy =le32_to_cpu(pnetwork->Privacy);
|
||||
pnetwork->Rssi = le32_to_cpu(pnetwork->Rssi);
|
||||
pnetwork->NetworkTypeInUse =le32_to_cpu(pnetwork->NetworkTypeInUse);
|
||||
pnetwork->Configuration.ATIMWindow = le32_to_cpu(pnetwork->Configuration.ATIMWindow);
|
||||
//pnetwork->Configuration.BeaconPeriod = le32_to_cpu(pnetwork->Configuration.BeaconPeriod);
|
||||
/* pnetwork->Configuration.BeaconPeriod = le32_to_cpu(pnetwork->Configuration.BeaconPeriod); */
|
||||
pnetwork->Configuration.DSConfig =le32_to_cpu(pnetwork->Configuration.DSConfig);
|
||||
pnetwork->Configuration.FHConfig.DwellTime=le32_to_cpu(pnetwork->Configuration.FHConfig.DwellTime);
|
||||
pnetwork->Configuration.FHConfig.HopPattern=le32_to_cpu(pnetwork->Configuration.FHConfig.HopPattern);
|
||||
|
|
@ -2884,20 +2876,20 @@ _func_enter_;
|
|||
|
||||
pnetwork->Length = get_WLAN_BSSID_EX_sz(pnetwork);
|
||||
_rtw_memcpy(&(pwlan->network), pnetwork, pnetwork->Length);
|
||||
//pwlan->fixed = true;
|
||||
/* pwlan->fixed = true; */
|
||||
|
||||
//rtw_list_insert_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue);
|
||||
/* rtw_list_insert_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue); */
|
||||
|
||||
// copy pdev_network information to pmlmepriv->cur_network
|
||||
/* copy pdev_network information to pmlmepriv->cur_network */
|
||||
_rtw_memcpy(&tgt_network->network, pnetwork, (get_WLAN_BSSID_EX_sz(pnetwork)));
|
||||
|
||||
// reset DSConfig
|
||||
//tgt_network->network.Configuration.DSConfig = (u32)rtw_ch2freq(pnetwork->Configuration.DSConfig);
|
||||
/* reset DSConfig */
|
||||
/* tgt_network->network.Configuration.DSConfig = (u32)rtw_ch2freq(pnetwork->Configuration.DSConfig); */
|
||||
|
||||
_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
|
||||
|
||||
_exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
|
||||
// we will set _FW_LINKED when there is one more sat to join us (rtw_stassoc_event_callback)
|
||||
/* we will set _FW_LINKED when there is one more sat to join us (rtw_stassoc_event_callback) */
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -2927,16 +2919,11 @@ _func_enter_;
|
|||
RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\nERROR: rtw_setstaKey_cmdrsp_callback => can't get sta_info\n\n"));
|
||||
goto exit;
|
||||
}
|
||||
|
||||
//psta->aid = psta->mac_id = psetstakey_rsp->keyid; //CAM_ID(CAM_ENTRY)
|
||||
|
||||
exit:
|
||||
|
||||
rtw_free_cmd_obj(pcmd);
|
||||
|
||||
_func_exit_;
|
||||
|
||||
}
|
||||
|
||||
void rtw_setassocsta_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd)
|
||||
{
|
||||
_irqL irqL;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue