mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-05-06 05:23:06 +00:00
rtl8188eu: Convert the typedef statements in include/wlan_bssdef.h
One remains that I still do not know how to convert; however, it has been moved to os_dep/ioctl_linux.c where it is used. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
parent
3c0fdf5c36
commit
a01908ab27
29 changed files with 411 additions and 495 deletions
|
@ -81,7 +81,7 @@ static void update_BCNTIM(_adapter *padapter)
|
|||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
WLAN_BSSID_EX *pnetwork_mlmeext = &(pmlmeinfo->network);
|
||||
struct wlan_bssid_ex *pnetwork_mlmeext = &(pmlmeinfo->network);
|
||||
unsigned char *pie = pnetwork_mlmeext->IEs;
|
||||
|
||||
/* update TIM IE */
|
||||
|
@ -165,16 +165,16 @@ static void update_BCNTIM(_adapter *padapter)
|
|||
set_tx_beacon_cmd(padapter);
|
||||
}
|
||||
|
||||
void rtw_add_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *data, u8 len)
|
||||
void rtw_add_bcn_ie(_adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index, u8 *data, u8 len)
|
||||
{
|
||||
PNDIS_802_11_VARIABLE_IEs pIE;
|
||||
struct ndis_802_11_var_ie * pIE;
|
||||
u8 bmatch = false;
|
||||
u8 *pie = pnetwork->IEs;
|
||||
u8 *p, *dst_ie, *premainder_ie=NULL, *pbackup_remainder_ie=NULL;
|
||||
u32 i, offset, ielen, ie_offset, remainder_ielen = 0;
|
||||
|
||||
for (i = sizeof(NDIS_802_11_FIXED_IEs); i < pnetwork->IELength;) {
|
||||
pIE = (PNDIS_802_11_VARIABLE_IEs)(pnetwork->IEs + i);
|
||||
for (i = sizeof(struct ndis_802_11_fixed_ie); i < pnetwork->IELength;) {
|
||||
pIE = (struct ndis_802_11_var_ie *)(pnetwork->IEs + i);
|
||||
|
||||
if (pIE->ElementID > index) {
|
||||
break;
|
||||
|
@ -227,7 +227,7 @@ void rtw_add_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *d
|
|||
pnetwork->IELength = offset + remainder_ielen;
|
||||
}
|
||||
|
||||
void rtw_remove_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index)
|
||||
void rtw_remove_bcn_ie(_adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index)
|
||||
{
|
||||
u8 *p, *dst_ie, *premainder_ie=NULL, *pbackup_remainder_ie=NULL;
|
||||
uint offset, ielen, ie_offset, remainder_ielen = 0;
|
||||
|
@ -454,7 +454,7 @@ void add_RATid(_adapter *padapter, struct sta_info *psta, u8 rssi_level)
|
|||
unsigned int tx_ra_bitmap=0;
|
||||
struct ht_priv *psta_ht = NULL;
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
WLAN_BSSID_EX *pcur_network = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network;
|
||||
struct wlan_bssid_ex *pcur_network = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network;
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
if (psta)
|
||||
|
@ -551,7 +551,7 @@ static void update_bmc_sta(_adapter *padapter)
|
|||
int i, supportRateNum = 0;
|
||||
unsigned int tx_ra_bitmap=0;
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
WLAN_BSSID_EX *pcur_network = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network;
|
||||
struct wlan_bssid_ex *pcur_network = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network;
|
||||
struct sta_info *psta = rtw_get_bcmc_stainfo(padapter);
|
||||
|
||||
if (psta) {
|
||||
|
@ -740,10 +740,10 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf)
|
|||
struct registry_priv *pregpriv = &padapter->registrypriv;
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct security_priv* psecuritypriv=&(padapter->securitypriv);
|
||||
WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network;
|
||||
struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network;
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
WLAN_BSSID_EX *pnetwork_mlmeext = &(pmlmeinfo->network);
|
||||
struct wlan_bssid_ex *pnetwork_mlmeext = &(pmlmeinfo->network);
|
||||
struct HT_info_element *pht_info=NULL;
|
||||
#ifdef CONFIG_P2P
|
||||
struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
|
||||
|
@ -814,7 +814,7 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf)
|
|||
}
|
||||
#ifdef CONFIG_80211N_HT
|
||||
/* set channel, bwmode */
|
||||
p = rtw_get_ie((pnetwork->IEs + sizeof(NDIS_802_11_FIXED_IEs)), _HT_ADD_INFO_IE_, &ie_len, (pnetwork->IELength - sizeof(NDIS_802_11_FIXED_IEs)));
|
||||
p = rtw_get_ie((pnetwork->IEs + sizeof(struct ndis_802_11_fixed_ie)), _HT_ADD_INFO_IE_, &ie_len, (pnetwork->IELength - sizeof(struct ndis_802_11_fixed_ie)));
|
||||
if ( p && ie_len) {
|
||||
pht_info = (struct HT_info_element *)(p+2);
|
||||
|
||||
|
@ -850,7 +850,7 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf)
|
|||
update_wireless_mode(padapter);
|
||||
|
||||
/* udpate capability after cur_wireless_mode updated */
|
||||
update_capinfo(padapter, rtw_get_capability((WLAN_BSSID_EX *)pnetwork));
|
||||
update_capinfo(padapter, rtw_get_capability((struct wlan_bssid_ex *)pnetwork));
|
||||
|
||||
/* let pnetwork_mlmeext == pnetwork_mlme. */
|
||||
_rtw_memcpy(pnetwork_mlmeext, pnetwork, pnetwork->Length);
|
||||
|
@ -891,7 +891,7 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf, int len)
|
|||
struct registry_priv *pregistrypriv = &padapter->registrypriv;
|
||||
struct security_priv *psecuritypriv = &padapter->securitypriv;
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
WLAN_BSSID_EX *pbss_network = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network;
|
||||
struct wlan_bssid_ex *pbss_network = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network;
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
u8 *ie = pbss_network->IEs;
|
||||
|
||||
|
@ -941,7 +941,7 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf, int len)
|
|||
p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _SSID_IE_, &ie_len, (pbss_network->IELength -_BEACON_IE_OFFSET_));
|
||||
if (p && ie_len>0)
|
||||
{
|
||||
_rtw_memset(&pbss_network->Ssid, 0, sizeof(NDIS_802_11_SSID));
|
||||
_rtw_memset(&pbss_network->Ssid, 0, sizeof(struct ndis_802_11_ssid));
|
||||
_rtw_memcpy(pbss_network->Ssid.Ssid, (p + 2), ie_len);
|
||||
pbss_network->Ssid.SsidLength = ie_len;
|
||||
}
|
||||
|
@ -983,7 +983,7 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf, int len)
|
|||
p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _ERPINFO_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_));
|
||||
if (p && ie_len>0)
|
||||
{
|
||||
ERP_IE_handler(padapter, (PNDIS_802_11_VARIABLE_IEs)p);
|
||||
ERP_IE_handler(padapter, (struct ndis_802_11_var_ie *)p);
|
||||
}
|
||||
|
||||
/* update privacy/security */
|
||||
|
@ -1158,14 +1158,14 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf, int len)
|
|||
pmlmepriv->htpriv.ampdu_enable = true;
|
||||
}
|
||||
|
||||
HT_caps_handler(padapter, (PNDIS_802_11_VARIABLE_IEs)pHT_caps_ie);
|
||||
HT_caps_handler(padapter, (struct ndis_802_11_var_ie *)pHT_caps_ie);
|
||||
|
||||
HT_info_handler(padapter, (PNDIS_802_11_VARIABLE_IEs)pHT_info_ie);
|
||||
HT_info_handler(padapter, (struct ndis_802_11_var_ie *)pHT_info_ie);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
pbss_network->Length = get_WLAN_BSSID_EX_sz((WLAN_BSSID_EX *)pbss_network);
|
||||
pbss_network->Length = get_wlan_bssid_ex_sz((struct wlan_bssid_ex *)pbss_network);
|
||||
|
||||
/* issue beacon to start bss network */
|
||||
start_bss_network(padapter, (u8*)pbss_network);
|
||||
|
@ -1331,7 +1331,7 @@ static void update_bcn_erpinfo_ie(_adapter *padapter)
|
|||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
WLAN_BSSID_EX *pnetwork = &(pmlmeinfo->network);
|
||||
struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);
|
||||
unsigned char *p, *ie = pnetwork->IEs;
|
||||
u32 len = 0;
|
||||
|
||||
|
@ -1344,7 +1344,7 @@ static void update_bcn_erpinfo_ie(_adapter *padapter)
|
|||
p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _ERPINFO_IE_, &len, (pnetwork->IELength - _BEACON_IE_OFFSET_));
|
||||
if (p && len>0)
|
||||
{
|
||||
PNDIS_802_11_VARIABLE_IEs pIE = (PNDIS_802_11_VARIABLE_IEs)p;
|
||||
struct ndis_802_11_var_ie * pIE = (struct ndis_802_11_var_ie *)p;
|
||||
|
||||
if (pmlmepriv->num_sta_non_erp == 1)
|
||||
pIE->data[0] |= RTW_ERP_INFO_NON_ERP_PRESENT|RTW_ERP_INFO_USE_PROTECTION;
|
||||
|
@ -1398,7 +1398,7 @@ static void update_bcn_wps_ie(_adapter *padapter)
|
|||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
WLAN_BSSID_EX *pnetwork = &(pmlmeinfo->network);
|
||||
struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);
|
||||
unsigned char *ie = pnetwork->IEs;
|
||||
u32 ielen = pnetwork->IELength;
|
||||
|
||||
|
|
|
@ -501,7 +501,7 @@ rtw_sitesurvey_cmd(~)
|
|||
### NOTE:#### (!!!!)
|
||||
MUST TAKE CARE THAT BEFORE CALLING THIS FUNC, YOU SHOULD HAVE LOCKED pmlmepriv->lock
|
||||
*/
|
||||
u8 rtw_sitesurvey_cmd(_adapter *padapter, NDIS_802_11_SSID *ssid, int ssid_num,
|
||||
u8 rtw_sitesurvey_cmd(_adapter *padapter, struct ndis_802_11_ssid *ssid, int ssid_num,
|
||||
struct rtw_ieee80211_channel *ch, int ch_num)
|
||||
{
|
||||
u8 res = _FAIL;
|
||||
|
@ -547,7 +547,7 @@ _func_enter_;
|
|||
int i;
|
||||
for (i=0; i<ssid_num && i< RTW_SSID_SCAN_AMOUNT; i++) {
|
||||
if (ssid[i].SsidLength) {
|
||||
_rtw_memcpy(&psurveyPara->ssid[i], &ssid[i], sizeof(NDIS_802_11_SSID));
|
||||
_rtw_memcpy(&psurveyPara->ssid[i], &ssid[i], sizeof(struct ndis_802_11_ssid));
|
||||
psurveyPara->ssid_num++;
|
||||
if (0)
|
||||
DBG_88E(FUNC_ADPT_FMT" ssid:(%s, %d)\n", FUNC_ADPT_ARG(padapter),
|
||||
|
@ -870,7 +870,7 @@ u8 rtw_createbss_cmd(_adapter *padapter)
|
|||
struct cmd_obj* pcmd;
|
||||
struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
WLAN_BSSID_EX *pdev_network = &padapter->registrypriv.dev_network;
|
||||
struct wlan_bssid_ex *pdev_network = &padapter->registrypriv.dev_network;
|
||||
u8 res=_SUCCESS;
|
||||
|
||||
_func_enter_;
|
||||
|
@ -892,7 +892,7 @@ _func_enter_;
|
|||
_rtw_init_listhead(&pcmd->list);
|
||||
pcmd->cmdcode = _CreateBss_CMD_;
|
||||
pcmd->parmbuf = (unsigned char *)pdev_network;
|
||||
pcmd->cmdsz = get_WLAN_BSSID_EX_sz((WLAN_BSSID_EX*)pdev_network);
|
||||
pcmd->cmdsz = get_wlan_bssid_ex_sz((struct wlan_bssid_ex*)pdev_network);
|
||||
pcmd->rsp = NULL;
|
||||
pcmd->rspsz = 0;
|
||||
pdev_network->Length = pcmd->cmdsz;
|
||||
|
@ -938,7 +938,7 @@ u8 rtw_joinbss_cmd(_adapter *padapter, struct wlan_network* pnetwork)
|
|||
{
|
||||
u8 res = _SUCCESS;
|
||||
uint t_len = 0;
|
||||
WLAN_BSSID_EX *psecnetwork;
|
||||
struct wlan_bssid_ex *psecnetwork;
|
||||
struct cmd_obj *pcmd;
|
||||
struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
|
@ -948,7 +948,7 @@ u8 rtw_joinbss_cmd(_adapter *padapter, struct wlan_network* pnetwork)
|
|||
#ifdef CONFIG_80211N_HT
|
||||
struct ht_priv *phtpriv = &pmlmepriv->htpriv;
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
NDIS_802_11_NETWORK_INFRASTRUCTURE ndis_network_mode = pnetwork->network.InfrastructureMode;
|
||||
enum ndis_802_11_network_infra ndis_network_mode = pnetwork->network.InfrastructureMode;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
|
||||
|
@ -969,7 +969,7 @@ _func_enter_;
|
|||
goto exit;
|
||||
}
|
||||
/* for IEs is fix buf size */
|
||||
t_len = sizeof(WLAN_BSSID_EX);
|
||||
t_len = sizeof(struct wlan_bssid_ex);
|
||||
|
||||
|
||||
/* for hidden ap to set fw_state here */
|
||||
|
@ -993,7 +993,7 @@ _func_enter_;
|
|||
}
|
||||
}
|
||||
|
||||
psecnetwork=(WLAN_BSSID_EX *)&psecuritypriv->sec_bss;
|
||||
psecnetwork=(struct wlan_bssid_ex *)&psecuritypriv->sec_bss;
|
||||
if (psecnetwork==NULL)
|
||||
{
|
||||
if (pcmd !=NULL)
|
||||
|
@ -1008,7 +1008,7 @@ _func_enter_;
|
|||
|
||||
_rtw_memset(psecnetwork, 0, t_len);
|
||||
|
||||
_rtw_memcpy(psecnetwork, &pnetwork->network, get_WLAN_BSSID_EX_sz(&pnetwork->network));
|
||||
_rtw_memcpy(psecnetwork, &pnetwork->network, get_wlan_bssid_ex_sz(&pnetwork->network));
|
||||
|
||||
psecuritypriv->authenticator_ie[0]=(unsigned char)psecnetwork->IELength;
|
||||
|
||||
|
@ -1079,7 +1079,7 @@ _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 */
|
||||
|
||||
_rtw_init_listhead(&pcmd->list);
|
||||
pcmd->cmdcode = _JoinBss_CMD_;/* GEN_CMD_CODE(_JoinBss) */
|
||||
|
@ -1139,7 +1139,7 @@ _func_exit_;
|
|||
return res;
|
||||
}
|
||||
|
||||
u8 rtw_setopmode_cmd(_adapter *padapter, NDIS_802_11_NETWORK_INFRASTRUCTURE networktype)
|
||||
u8 rtw_setopmode_cmd(_adapter *padapter, enum ndis_802_11_network_infra networktype)
|
||||
{
|
||||
struct cmd_obj* ph2c;
|
||||
struct setopmode_parm* psetop;
|
||||
|
@ -2435,7 +2435,7 @@ void rtw_createbss_cmd_callback(_adapter *padapter, struct cmd_obj *pcmd)
|
|||
struct sta_info *psta = NULL;
|
||||
struct wlan_network *pwlan = NULL;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX *)pcmd->parmbuf;
|
||||
struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)pcmd->parmbuf;
|
||||
struct wlan_network *tgt_network = &(pmlmepriv->cur_network);
|
||||
|
||||
_func_enter_;
|
||||
|
@ -2482,23 +2482,15 @@ _func_enter_;
|
|||
rtw_list_insert_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue);
|
||||
}
|
||||
|
||||
pnetwork->Length = get_WLAN_BSSID_EX_sz(pnetwork);
|
||||
pnetwork->Length = get_wlan_bssid_ex_sz(pnetwork);
|
||||
_rtw_memcpy(&(pwlan->network), pnetwork, pnetwork->Length);
|
||||
/* pwlan->fixed = true; */
|
||||
|
||||
/* rtw_list_insert_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue); */
|
||||
|
||||
/* 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); */
|
||||
_rtw_memcpy(&tgt_network->network, pnetwork, (get_wlan_bssid_ex_sz(pnetwork)));
|
||||
|
||||
_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) */
|
||||
|
||||
}
|
||||
|
||||
createbss_cmd_fail:
|
||||
|
|
|
@ -408,7 +408,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)
|
|||
{
|
||||
u8 wireless_mode;
|
||||
int sz = 0, rateLen;
|
||||
WLAN_BSSID_EX* pdev_network = &pregistrypriv->dev_network;
|
||||
struct wlan_bssid_ex* pdev_network = &pregistrypriv->dev_network;
|
||||
u8* ie = pdev_network->IEs;
|
||||
|
||||
_func_enter_;
|
||||
|
@ -1534,7 +1534,7 @@ static uint rtw_p2p_attr_remove(u8 *ie, uint ielen_ori, u8 attr_id)
|
|||
return ielen;
|
||||
}
|
||||
|
||||
void rtw_WLAN_BSSID_EX_remove_p2p_attr(WLAN_BSSID_EX *bss_ex, u8 attr_id)
|
||||
void rtw_wlan_bssid_ex_remove_p2p_attr(struct wlan_bssid_ex *bss_ex, u8 attr_id)
|
||||
{
|
||||
u8 *p2p_ie;
|
||||
uint p2p_ielen, p2p_ielen_ori;
|
||||
|
|
|
@ -37,7 +37,7 @@ extern void indicate_wx_scan_complete_event(_adapter *padapter);
|
|||
(addr[4] == 0xff) && (addr[5] == 0xff) ) ? true : false \
|
||||
)
|
||||
|
||||
u8 rtw_validate_ssid(NDIS_802_11_SSID *ssid)
|
||||
u8 rtw_validate_ssid(struct ndis_802_11_ssid *ssid)
|
||||
{
|
||||
u8 i;
|
||||
u8 ret=true;
|
||||
|
@ -126,14 +126,14 @@ _func_enter_;
|
|||
/* submit createbss_cmd to change to a ADHOC_MASTER */
|
||||
|
||||
/* pmlmepriv->lock has been acquired by caller... */
|
||||
WLAN_BSSID_EX *pdev_network = &(padapter->registrypriv.dev_network);
|
||||
struct wlan_bssid_ex *pdev_network = &(padapter->registrypriv.dev_network);
|
||||
|
||||
pmlmepriv->fw_state = WIFI_ADHOC_MASTER_STATE;
|
||||
|
||||
pibss = padapter->registrypriv.dev_network.MacAddress;
|
||||
|
||||
_rtw_memset(&pdev_network->Ssid, 0, sizeof(NDIS_802_11_SSID));
|
||||
_rtw_memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(NDIS_802_11_SSID));
|
||||
_rtw_memset(&pdev_network->Ssid, 0, sizeof(struct ndis_802_11_ssid));
|
||||
_rtw_memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndis_802_11_ssid));
|
||||
|
||||
rtw_update_registrypriv_dev_network(padapter);
|
||||
|
||||
|
@ -277,7 +277,7 @@ _func_exit_;
|
|||
return status;
|
||||
}
|
||||
|
||||
u8 rtw_set_802_11_ssid(_adapter* padapter, NDIS_802_11_SSID *ssid)
|
||||
u8 rtw_set_802_11_ssid(_adapter* padapter, struct ndis_802_11_ssid *ssid)
|
||||
{
|
||||
_irqL irqL;
|
||||
u8 status = _SUCCESS;
|
||||
|
@ -377,7 +377,7 @@ handle_tkip_countermeasure:
|
|||
}
|
||||
}
|
||||
|
||||
_rtw_memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(NDIS_802_11_SSID));
|
||||
_rtw_memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(struct ndis_802_11_ssid));
|
||||
pmlmepriv->assoc_by_bssid=false;
|
||||
|
||||
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) {
|
||||
|
@ -401,12 +401,12 @@ _func_exit_;
|
|||
}
|
||||
|
||||
u8 rtw_set_802_11_infrastructure_mode(_adapter* padapter,
|
||||
NDIS_802_11_NETWORK_INFRASTRUCTURE networktype)
|
||||
enum ndis_802_11_network_infra networktype)
|
||||
{
|
||||
_irqL irqL;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct wlan_network *cur_network = &pmlmepriv->cur_network;
|
||||
NDIS_802_11_NETWORK_INFRASTRUCTURE* pold_state = &(cur_network->network.InfrastructureMode);
|
||||
enum ndis_802_11_network_infra* pold_state = &(cur_network->network.InfrastructureMode);
|
||||
|
||||
_func_enter_;
|
||||
|
||||
|
@ -507,7 +507,7 @@ _func_exit_;
|
|||
return true;
|
||||
}
|
||||
|
||||
u8 rtw_set_802_11_bssid_list_scan(_adapter* padapter, NDIS_802_11_SSID *pssid, int ssid_max_num)
|
||||
u8 rtw_set_802_11_bssid_list_scan(_adapter* padapter, struct ndis_802_11_ssid *pssid, int ssid_max_num)
|
||||
{
|
||||
_irqL irqL;
|
||||
struct mlme_priv *pmlmepriv= &padapter->mlmepriv;
|
||||
|
@ -559,7 +559,7 @@ _func_exit_;
|
|||
return res;
|
||||
}
|
||||
|
||||
u8 rtw_set_802_11_authentication_mode(_adapter* padapter, NDIS_802_11_AUTHENTICATION_MODE authmode)
|
||||
u8 rtw_set_802_11_authentication_mode(_adapter* padapter, enum ndis_802_11_auth_mode authmode)
|
||||
{
|
||||
struct security_priv *psecuritypriv = &padapter->securitypriv;
|
||||
int res;
|
||||
|
@ -588,7 +588,7 @@ _func_exit_;
|
|||
return ret;
|
||||
}
|
||||
|
||||
u8 rtw_set_802_11_add_wep(_adapter* padapter, NDIS_802_11_WEP *wep){
|
||||
u8 rtw_set_802_11_add_wep(_adapter* padapter, struct ndis_802_11_wep *wep){
|
||||
|
||||
sint keyid,res;
|
||||
struct security_priv* psecuritypriv=&(padapter->securitypriv);
|
||||
|
@ -690,7 +690,7 @@ _func_exit_;
|
|||
|
||||
}
|
||||
|
||||
u8 rtw_set_802_11_add_key(_adapter* padapter, NDIS_802_11_KEY *key){
|
||||
u8 rtw_set_802_11_add_key(_adapter* padapter, struct ndis_802_11_key *key){
|
||||
|
||||
uint encryptionalgo;
|
||||
u8 * pbssid;
|
||||
|
@ -883,8 +883,8 @@ _func_enter_;
|
|||
if ((padapter->securitypriv.dot11AuthAlgrthm !=dot11AuthAlgrthm_8021X)&&(encryptionalgo== _WEP40_ || encryptionalgo== _WEP104_))
|
||||
{
|
||||
u32 keyindex;
|
||||
u32 len = FIELD_OFFSET(NDIS_802_11_KEY, KeyMaterial) + key->KeyLength;
|
||||
NDIS_802_11_WEP *wep = &padapter->securitypriv.ndiswep;
|
||||
u32 len = FIELD_OFFSET(struct ndis_802_11_key, KeyMaterial) + key->KeyLength;
|
||||
struct ndis_802_11_wep *wep = &padapter->securitypriv.ndiswep;
|
||||
|
||||
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY: +++++ WEP key +++++\n"));
|
||||
|
||||
|
@ -912,12 +912,12 @@ _func_enter_;
|
|||
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY: +++++ SetRSC+++++\n"));
|
||||
if (bgroup == true)
|
||||
{
|
||||
NDIS_802_11_KEY_RSC keysrc=key->KeyRSC & 0x00FFFFFFFFFFFFULL;
|
||||
unsigned long long keysrc = key->KeyRSC & 0x00FFFFFFFFFFFFULL;
|
||||
_rtw_memcpy(&padapter->securitypriv.dot11Grprxpn, &keysrc, 8);
|
||||
}
|
||||
else
|
||||
{
|
||||
NDIS_802_11_KEY_RSC keysrc=key->KeyRSC & 0x00FFFFFFFFFFFFULL;
|
||||
unsigned long long keysrc = key->KeyRSC & 0x00FFFFFFFFFFFFULL;
|
||||
_rtw_memcpy(&padapter->securitypriv.dot11Grptxpn, &keysrc, 8);
|
||||
}
|
||||
|
||||
|
@ -1053,7 +1053,7 @@ _func_exit_;
|
|||
return ret;
|
||||
}
|
||||
|
||||
u8 rtw_set_802_11_remove_key(_adapter* padapter, NDIS_802_11_REMOVE_KEY *key){
|
||||
u8 rtw_set_802_11_remove_key(_adapter* padapter, struct ndis_802_11_remove_key *key){
|
||||
|
||||
u8 *pbssid;
|
||||
struct sta_info *stainfo;
|
||||
|
@ -1108,7 +1108,7 @@ u16 rtw_get_cur_max_rate(_adapter *adapter)
|
|||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
struct registry_priv *pregistrypriv = &adapter->registrypriv;
|
||||
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
|
||||
WLAN_BSSID_EX *pcur_bss = &pmlmepriv->cur_network.network;
|
||||
struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;
|
||||
#ifdef CONFIG_80211N_HT
|
||||
struct rtw_ieee80211_ht_cap *pht_capie;
|
||||
u8 rf_type = 0;
|
||||
|
|
|
@ -63,7 +63,7 @@ _func_enter_;
|
|||
|
||||
set_scanned_network_val(pmlmepriv, 0);
|
||||
|
||||
_rtw_memset(&pmlmepriv->assoc_ssid,0,sizeof(NDIS_802_11_SSID));
|
||||
_rtw_memset(&pmlmepriv->assoc_ssid,0,sizeof(struct ndis_802_11_ssid));
|
||||
|
||||
pbuf = rtw_zvmalloc(MAX_BSS_CNT * (sizeof(struct wlan_network)));
|
||||
|
||||
|
@ -428,7 +428,7 @@ u8 *rtw_get_capability_from_ie(u8 *ie)
|
|||
}
|
||||
|
||||
|
||||
u16 rtw_get_capability(WLAN_BSSID_EX *bss)
|
||||
u16 rtw_get_capability(struct wlan_bssid_ex *bss)
|
||||
{
|
||||
__le16 val;
|
||||
_func_enter_;
|
||||
|
@ -559,14 +559,14 @@ int rtw_is_same_ibss(_adapter *adapter, struct wlan_network *pnetwork)
|
|||
|
||||
}
|
||||
|
||||
inline int is_same_ess(WLAN_BSSID_EX *a, WLAN_BSSID_EX *b);
|
||||
inline int is_same_ess(WLAN_BSSID_EX *a, WLAN_BSSID_EX *b)
|
||||
inline int is_same_ess(struct wlan_bssid_ex *a, struct wlan_bssid_ex *b);
|
||||
inline int is_same_ess(struct wlan_bssid_ex *a, struct wlan_bssid_ex *b)
|
||||
{
|
||||
return (a->Ssid.SsidLength == b->Ssid.SsidLength)
|
||||
&& _rtw_memcmp(a->Ssid.Ssid, b->Ssid.Ssid, a->Ssid.SsidLength)==true;
|
||||
}
|
||||
|
||||
int is_same_network(WLAN_BSSID_EX *src, WLAN_BSSID_EX *dst)
|
||||
int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst)
|
||||
{
|
||||
u16 s_cap, d_cap;
|
||||
__le16 le_scap, le_dcap;
|
||||
|
@ -624,7 +624,7 @@ _func_exit_;
|
|||
|
||||
}
|
||||
|
||||
void update_network(WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src,
|
||||
void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,
|
||||
_adapter * padapter, bool update_ie)
|
||||
{
|
||||
u8 ss_ori = dst->PhyInfo.SignalStrength;
|
||||
|
@ -680,7 +680,7 @@ _func_enter_;
|
|||
}
|
||||
|
||||
if (update_ie)
|
||||
_rtw_memcpy((u8 *)dst, (u8 *)src, get_WLAN_BSSID_EX_sz(src));
|
||||
_rtw_memcpy((u8 *)dst, (u8 *)src, get_wlan_bssid_ex_sz(src));
|
||||
|
||||
dst->PhyInfo.SignalStrength = ss_final;
|
||||
dst->PhyInfo.SignalQuality = sq_final;
|
||||
|
@ -698,7 +698,7 @@ _func_enter_;
|
|||
_func_exit_;
|
||||
}
|
||||
|
||||
static void update_current_network(_adapter *adapter, WLAN_BSSID_EX *pnetwork)
|
||||
static void update_current_network(_adapter *adapter, struct wlan_bssid_ex *pnetwork)
|
||||
{
|
||||
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
|
||||
|
||||
|
@ -707,7 +707,7 @@ _func_enter_;
|
|||
if ( (check_fwstate(pmlmepriv, _FW_LINKED)== true) && (is_same_network(&(pmlmepriv->cur_network.network), pnetwork)))
|
||||
{
|
||||
update_network(&(pmlmepriv->cur_network.network), pnetwork,adapter, true);
|
||||
rtw_update_protection(adapter, (pmlmepriv->cur_network.network.IEs) + sizeof (NDIS_802_11_FIXED_IEs),
|
||||
rtw_update_protection(adapter, (pmlmepriv->cur_network.network.IEs) + sizeof (struct ndis_802_11_fixed_ie),
|
||||
pmlmepriv->cur_network.network.IELength);
|
||||
}
|
||||
_func_exit_;
|
||||
|
@ -716,7 +716,7 @@ _func_exit_;
|
|||
/*
|
||||
Caller must hold pmlmepriv->lock first.
|
||||
*/
|
||||
void rtw_update_scanned_network(_adapter *adapter, WLAN_BSSID_EX *target)
|
||||
void rtw_update_scanned_network(_adapter *adapter, struct wlan_bssid_ex *target)
|
||||
{
|
||||
_irqL irqL;
|
||||
_list *plist, *phead;
|
||||
|
@ -765,7 +765,7 @@ _func_enter_;
|
|||
pnetwork = oldest;
|
||||
|
||||
rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(target->PhyInfo.Optimum_antenna));
|
||||
_rtw_memcpy(&(pnetwork->network), target, get_WLAN_BSSID_EX_sz(target));
|
||||
_rtw_memcpy(&(pnetwork->network), target, get_wlan_bssid_ex_sz(target));
|
||||
/* variable initialize */
|
||||
pnetwork->fixed = false;
|
||||
pnetwork->last_scanned = rtw_get_current_time();
|
||||
|
@ -787,7 +787,7 @@ _func_enter_;
|
|||
goto exit;
|
||||
}
|
||||
|
||||
bssid_ex_sz = get_WLAN_BSSID_EX_sz(target);
|
||||
bssid_ex_sz = get_wlan_bssid_ex_sz(target);
|
||||
target->Length = bssid_ex_sz;
|
||||
rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(target->PhyInfo.Optimum_antenna));
|
||||
_rtw_memcpy(&(pnetwork->network), target, bssid_ex_sz );
|
||||
|
@ -824,7 +824,7 @@ exit:
|
|||
_func_exit_;
|
||||
}
|
||||
|
||||
void rtw_add_network(_adapter *adapter, WLAN_BSSID_EX *pnetwork)
|
||||
void rtw_add_network(_adapter *adapter, struct wlan_bssid_ex *pnetwork)
|
||||
{
|
||||
_irqL irqL;
|
||||
struct mlme_priv *pmlmepriv = &(((_adapter *)adapter)->mlmepriv);
|
||||
|
@ -832,7 +832,7 @@ void rtw_add_network(_adapter *adapter, WLAN_BSSID_EX *pnetwork)
|
|||
_func_enter_;
|
||||
|
||||
#if defined(CONFIG_P2P)
|
||||
rtw_WLAN_BSSID_EX_remove_p2p_attr(pnetwork, P2P_ATTR_GROUP_INFO);
|
||||
rtw_wlan_bssid_ex_remove_p2p_attr(pnetwork, P2P_ATTR_GROUP_INFO);
|
||||
#endif
|
||||
|
||||
update_current_network(adapter, pnetwork);
|
||||
|
@ -912,17 +912,17 @@ void rtw_survey_event_callback(_adapter *adapter, u8 *pbuf)
|
|||
{
|
||||
_irqL irqL;
|
||||
u32 len;
|
||||
WLAN_BSSID_EX *pnetwork;
|
||||
struct wlan_bssid_ex *pnetwork;
|
||||
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
|
||||
|
||||
_func_enter_;
|
||||
|
||||
pnetwork = (WLAN_BSSID_EX *)pbuf;
|
||||
pnetwork = (struct wlan_bssid_ex *)pbuf;
|
||||
|
||||
RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("rtw_survey_event_callback, ssid=%s\n", pnetwork->Ssid.Ssid));
|
||||
|
||||
len = get_WLAN_BSSID_EX_sz(pnetwork);
|
||||
if (len > (sizeof(WLAN_BSSID_EX))) {
|
||||
len = get_wlan_bssid_ex_sz(pnetwork);
|
||||
if (len > (sizeof(struct wlan_bssid_ex))) {
|
||||
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n ****rtw_survey_event_callback: return a wrong bss ***\n"));
|
||||
return;
|
||||
}
|
||||
|
@ -1020,15 +1020,15 @@ _func_enter_;
|
|||
if (rtw_select_and_join_from_scanned_queue(pmlmepriv)==_SUCCESS) {
|
||||
_set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT );
|
||||
} else {
|
||||
WLAN_BSSID_EX *pdev_network = &(adapter->registrypriv.dev_network);
|
||||
struct wlan_bssid_ex *pdev_network = &(adapter->registrypriv.dev_network);
|
||||
u8 *pibss = adapter->registrypriv.dev_network.MacAddress;
|
||||
|
||||
_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY);
|
||||
|
||||
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("switching to adhoc master\n"));
|
||||
|
||||
_rtw_memset(&pdev_network->Ssid, 0, sizeof(NDIS_802_11_SSID));
|
||||
_rtw_memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(NDIS_802_11_SSID));
|
||||
_rtw_memset(&pdev_network->Ssid, 0, sizeof(struct ndis_802_11_ssid));
|
||||
_rtw_memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndis_802_11_ssid));
|
||||
|
||||
rtw_update_registrypriv_dev_network(adapter);
|
||||
rtw_generate_random_ibss(pibss);
|
||||
|
@ -1230,7 +1230,7 @@ void rtw_indicate_disconnect( _adapter *padapter )
|
|||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
|
||||
struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network);
|
||||
struct sta_info *psta;
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
|
||||
|
@ -1445,7 +1445,7 @@ static void rtw_joinbss_update_network(_adapter *padapter, struct wlan_network *
|
|||
break;
|
||||
}
|
||||
|
||||
rtw_update_protection(padapter, (cur_network->network.IEs) + sizeof (NDIS_802_11_FIXED_IEs),
|
||||
rtw_update_protection(padapter, (cur_network->network.IEs) + sizeof (struct ndis_802_11_fixed_ie),
|
||||
(cur_network->network.IELength));
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
|
@ -1488,8 +1488,8 @@ _func_enter_;
|
|||
|
||||
the_same_macaddr = _rtw_memcmp(pnetwork->network.MacAddress, cur_network->network.MacAddress, ETH_ALEN);
|
||||
|
||||
pnetwork->network.Length = get_WLAN_BSSID_EX_sz(&pnetwork->network);
|
||||
if (pnetwork->network.Length > sizeof(WLAN_BSSID_EX)) {
|
||||
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_,("\n\n ***joinbss_evt_callback return a wrong bss ***\n\n"));
|
||||
goto ignore_nolock;
|
||||
}
|
||||
|
@ -1754,7 +1754,7 @@ void rtw_stadel_event_callback(_adapter *adapter, u8 *pbuf)
|
|||
int mac_id=-1;
|
||||
struct sta_info *psta;
|
||||
struct wlan_network* pwlan = NULL;
|
||||
WLAN_BSSID_EX *pdev_network=NULL;
|
||||
struct wlan_bssid_ex *pdev_network=NULL;
|
||||
u8* pibss = NULL;
|
||||
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
|
||||
struct stadel_event *pstadel = (struct stadel_event*)pbuf;
|
||||
|
@ -1835,10 +1835,10 @@ _func_enter_;
|
|||
pdev_network = &(adapter->registrypriv.dev_network);
|
||||
pibss = adapter->registrypriv.dev_network.MacAddress;
|
||||
|
||||
_rtw_memcpy(pdev_network, &tgt_network->network, get_WLAN_BSSID_EX_sz(&tgt_network->network));
|
||||
_rtw_memcpy(pdev_network, &tgt_network->network, get_wlan_bssid_ex_sz(&tgt_network->network));
|
||||
|
||||
_rtw_memset(&pdev_network->Ssid, 0, sizeof(NDIS_802_11_SSID));
|
||||
_rtw_memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(NDIS_802_11_SSID));
|
||||
_rtw_memset(&pdev_network->Ssid, 0, sizeof(struct ndis_802_11_ssid));
|
||||
_rtw_memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndis_802_11_ssid));
|
||||
|
||||
rtw_update_registrypriv_dev_network(adapter);
|
||||
|
||||
|
@ -2483,16 +2483,16 @@ void rtw_init_registrypriv_dev_network( _adapter* adapter)
|
|||
{
|
||||
struct registry_priv* pregistrypriv = &adapter->registrypriv;
|
||||
struct eeprom_priv* peepriv = &adapter->eeprompriv;
|
||||
WLAN_BSSID_EX *pdev_network = &pregistrypriv->dev_network;
|
||||
struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network;
|
||||
u8 *myhwaddr = myid(peepriv);
|
||||
|
||||
_func_enter_;
|
||||
|
||||
_rtw_memcpy(pdev_network->MacAddress, myhwaddr, ETH_ALEN);
|
||||
|
||||
_rtw_memcpy(&pdev_network->Ssid, &pregistrypriv->ssid, sizeof(NDIS_802_11_SSID));
|
||||
_rtw_memcpy(&pdev_network->Ssid, &pregistrypriv->ssid, sizeof(struct ndis_802_11_ssid));
|
||||
|
||||
pdev_network->Configuration.Length=sizeof(NDIS_802_11_CONFIGURATION);
|
||||
pdev_network->Configuration.Length=sizeof(struct ndis_802_11_config);
|
||||
pdev_network->Configuration.BeaconPeriod = 100;
|
||||
pdev_network->Configuration.FHConfig.Length = 0;
|
||||
pdev_network->Configuration.FHConfig.HopPattern = 0;
|
||||
|
@ -2508,7 +2508,7 @@ void rtw_update_registrypriv_dev_network(_adapter* adapter)
|
|||
{
|
||||
int sz=0;
|
||||
struct registry_priv* pregistrypriv = &adapter->registrypriv;
|
||||
WLAN_BSSID_EX *pdev_network = &pregistrypriv->dev_network;
|
||||
struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network;
|
||||
struct security_priv* psecuritypriv = &adapter->securitypriv;
|
||||
struct wlan_network *cur_network = &adapter->mlmepriv.cur_network;
|
||||
/* struct xmit_priv *pxmitpriv = &adapter->xmitpriv; */
|
||||
|
@ -2561,7 +2561,7 @@ _func_enter_;
|
|||
|
||||
pdev_network->IELength = sz;
|
||||
|
||||
pdev_network->Length = get_WLAN_BSSID_EX_sz((WLAN_BSSID_EX *)pdev_network);
|
||||
pdev_network->Length = get_wlan_bssid_ex_sz((struct wlan_bssid_ex *)pdev_network);
|
||||
|
||||
/* notes: translate IELength & Length after assign the Length to cmdsz in createbss_cmd(); */
|
||||
/* pdev_network->IELength = cpu_to_le32(sz); */
|
||||
|
@ -2745,7 +2745,7 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len)
|
|||
|
||||
/* check Max Rx A-MPDU Size */
|
||||
len = 0;
|
||||
p = rtw_get_ie(pie+sizeof (NDIS_802_11_FIXED_IEs), _HT_CAPABILITY_IE_, &len, ie_len-sizeof (NDIS_802_11_FIXED_IEs));
|
||||
p = rtw_get_ie(pie+sizeof (struct ndis_802_11_fixed_ie), _HT_CAPABILITY_IE_, &len, ie_len-sizeof (struct ndis_802_11_fixed_ie));
|
||||
if (p && len>0)
|
||||
{
|
||||
pht_capie = (struct rtw_ieee80211_ht_cap *)(p+2);
|
||||
|
@ -2759,7 +2759,7 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len)
|
|||
|
||||
|
||||
len=0;
|
||||
p = rtw_get_ie(pie+sizeof (NDIS_802_11_FIXED_IEs), _HT_ADD_INFO_IE_, &len, ie_len-sizeof (NDIS_802_11_FIXED_IEs));
|
||||
p = rtw_get_ie(pie+sizeof (struct ndis_802_11_fixed_ie), _HT_ADD_INFO_IE_, &len, ie_len-sizeof (struct ndis_802_11_fixed_ie));
|
||||
if (p && len>0) {
|
||||
/* todo: */
|
||||
}
|
||||
|
@ -2875,7 +2875,7 @@ void _rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network)
|
|||
DBG_88E("roaming from %s(%pM length:%d\n",
|
||||
pnetwork->network.Ssid.Ssid, pnetwork->network.MacAddress,
|
||||
pnetwork->network.Ssid.SsidLength);
|
||||
_rtw_memcpy(&pmlmepriv->assoc_ssid, &pnetwork->network.Ssid, sizeof(NDIS_802_11_SSID));
|
||||
_rtw_memcpy(&pmlmepriv->assoc_ssid, &pnetwork->network.Ssid, sizeof(struct ndis_802_11_ssid));
|
||||
|
||||
pmlmepriv->assoc_by_bssid = false;
|
||||
|
||||
|
|
|
@ -666,7 +666,7 @@ unsigned int OnProbeReq(_adapter *padapter, union recv_frame *precv_frame)
|
|||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
WLAN_BSSID_EX *cur = &(pmlmeinfo->network);
|
||||
struct wlan_bssid_ex *cur = &(pmlmeinfo->network);
|
||||
u8 *pframe = precv_frame->u.hdr.rx_data;
|
||||
uint len = precv_frame->u.hdr.len;
|
||||
u8 is_valid_p2p_probereq = false;
|
||||
|
@ -832,7 +832,7 @@ unsigned int OnBeacon(_adapter *padapter, union recv_frame *precv_frame)
|
|||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
u8 *pframe = precv_frame->u.hdr.rx_data;
|
||||
uint len = precv_frame->u.hdr.len;
|
||||
WLAN_BSSID_EX *pbss;
|
||||
struct wlan_bssid_ex *pbss;
|
||||
int ret = _SUCCESS;
|
||||
|
||||
if (pmlmeext->sitesurvey_res.state == SCAN_PROCESS) {
|
||||
|
@ -845,13 +845,13 @@ unsigned int OnBeacon(_adapter *padapter, union recv_frame *precv_frame)
|
|||
if (pmlmeinfo->state & WIFI_FW_AUTH_NULL)
|
||||
{
|
||||
/* we should update current network before auth, or some IE is wrong */
|
||||
pbss = (WLAN_BSSID_EX*)rtw_malloc(sizeof(WLAN_BSSID_EX));
|
||||
pbss = (struct wlan_bssid_ex*)rtw_malloc(sizeof(struct wlan_bssid_ex));
|
||||
if (pbss) {
|
||||
if (collect_bss_info(padapter, precv_frame, pbss) == _SUCCESS) {
|
||||
update_network(&(pmlmepriv->cur_network.network), pbss, padapter, true);
|
||||
rtw_get_bcn_info(&(pmlmepriv->cur_network));
|
||||
}
|
||||
rtw_mfree((u8*)pbss, sizeof(WLAN_BSSID_EX));
|
||||
rtw_mfree((u8*)pbss, sizeof(struct wlan_bssid_ex));
|
||||
}
|
||||
|
||||
/* check the vendor of the assoc AP */
|
||||
|
@ -1216,7 +1216,7 @@ unsigned int OnAssocReq(_adapter *padapter, union recv_frame *precv_frame)
|
|||
struct security_priv *psecuritypriv = &padapter->securitypriv;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
WLAN_BSSID_EX *cur = &(pmlmeinfo->network);
|
||||
struct wlan_bssid_ex *cur = &(pmlmeinfo->network);
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
u8 *pframe = precv_frame->u.hdr.rx_data;
|
||||
uint pkt_len = precv_frame->u.hdr.len;
|
||||
|
@ -1743,14 +1743,14 @@ unsigned int OnAssocRsp(_adapter *padapter, union recv_frame *precv_frame)
|
|||
uint i;
|
||||
int res;
|
||||
unsigned short status;
|
||||
PNDIS_802_11_VARIABLE_IEs pIE;
|
||||
struct ndis_802_11_var_ie * pIE;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
/* WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); */
|
||||
/* struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); */
|
||||
u8 *pframe = precv_frame->u.hdr.rx_data;
|
||||
uint pkt_len = precv_frame->u.hdr.len;
|
||||
PNDIS_802_11_VARIABLE_IEs pWapiIE = NULL;
|
||||
struct ndis_802_11_var_ie * pWapiIE = NULL;
|
||||
|
||||
DBG_88E("%s\n", __func__);
|
||||
|
||||
|
@ -1788,7 +1788,7 @@ unsigned int OnAssocRsp(_adapter *padapter, union recv_frame *precv_frame)
|
|||
/* to handle HT, WMM, rate adaptive, update MAC reg */
|
||||
/* for not to handle the synchronous IO in the tasklet */
|
||||
for (i = (6 + WLAN_HDR_A3_LEN); i < pkt_len;) {
|
||||
pIE = (PNDIS_802_11_VARIABLE_IEs)(pframe + i);
|
||||
pIE = (struct ndis_802_11_var_ie *)(pframe + i);
|
||||
|
||||
switch (pIE->ElementID) {
|
||||
case _VENDOR_SPECIFIC_IE_:
|
||||
|
@ -3829,7 +3829,7 @@ void issue_probersp_p2p(_adapter *padapter, unsigned char *da)
|
|||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
/* WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); */
|
||||
/* struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); */
|
||||
u16 beacon_interval = 100;
|
||||
u16 capInfo = 0;
|
||||
struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
|
||||
|
@ -5162,7 +5162,7 @@ void issue_beacon(_adapter *padapter, int timeout_ms)
|
|||
#endif /* if defined (CONFIG_AP_MODE) */
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
|
||||
struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network);
|
||||
u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
|
||||
#ifdef CONFIG_P2P
|
||||
struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
|
||||
|
@ -5417,7 +5417,7 @@ void issue_probersp(_adapter *padapter, unsigned char *da, u8 is_valid_p2p_probe
|
|||
#endif /* if defined (CONFIG_AP_MODE) */
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
|
||||
struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network);
|
||||
unsigned int rate_len;
|
||||
#ifdef CONFIG_P2P
|
||||
struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
|
||||
|
@ -5584,7 +5584,7 @@ void issue_probersp(_adapter *padapter, unsigned char *da, u8 is_valid_p2p_probe
|
|||
return;
|
||||
}
|
||||
|
||||
static int _issue_probereq(_adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da, int wait_ack)
|
||||
static int _issue_probereq(_adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da, int wait_ack)
|
||||
{
|
||||
int ret = _FAIL;
|
||||
struct xmit_frame *pmgntframe;
|
||||
|
@ -5685,12 +5685,12 @@ exit:
|
|||
return ret;
|
||||
}
|
||||
|
||||
inline void issue_probereq(_adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da)
|
||||
inline void issue_probereq(_adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da)
|
||||
{
|
||||
_issue_probereq(padapter, pssid, da, false);
|
||||
}
|
||||
|
||||
int issue_probereq_ex(_adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da,
|
||||
int issue_probereq_ex(_adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da,
|
||||
int try_cnt, int wait_ms)
|
||||
{
|
||||
int ret;
|
||||
|
@ -5888,7 +5888,7 @@ void issue_asocrsp(_adapter *padapter, unsigned short status, struct sta_info *p
|
|||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
WLAN_BSSID_EX *pnetwork = &(pmlmeinfo->network);
|
||||
struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);
|
||||
u8 *ie = pnetwork->IEs;
|
||||
__le16 lestatus, leval;
|
||||
#ifdef CONFIG_P2P
|
||||
|
@ -6030,7 +6030,7 @@ void issue_assocreq(_adapter *padapter)
|
|||
__le16 le_tmp;
|
||||
unsigned int i, j, ie_len, index=0;
|
||||
unsigned char rf_type, bssrate[NumRates], sta_bssrate[NumRates];
|
||||
PNDIS_802_11_VARIABLE_IEs pIE;
|
||||
struct ndis_802_11_var_ie * pIE;
|
||||
struct registry_priv *pregpriv = &padapter->registrypriv;
|
||||
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
|
@ -6148,14 +6148,14 @@ void issue_assocreq(_adapter *padapter)
|
|||
}
|
||||
|
||||
/* RSN */
|
||||
p = rtw_get_ie((pmlmeinfo->network.IEs + sizeof(NDIS_802_11_FIXED_IEs)), _RSN_IE_2_, &ie_len, (pmlmeinfo->network.IELength - sizeof(NDIS_802_11_FIXED_IEs)));
|
||||
p = rtw_get_ie((pmlmeinfo->network.IEs + sizeof(struct ndis_802_11_fixed_ie)), _RSN_IE_2_, &ie_len, (pmlmeinfo->network.IELength - sizeof(struct ndis_802_11_fixed_ie)));
|
||||
if (p != NULL)
|
||||
pframe = rtw_set_ie(pframe, _RSN_IE_2_, ie_len, (p + 2), &(pattrib->pktlen));
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
/* HT caps */
|
||||
if (padapter->mlmepriv.htpriv.ht_option==true) {
|
||||
p = rtw_get_ie((pmlmeinfo->network.IEs + sizeof(NDIS_802_11_FIXED_IEs)), _HT_CAPABILITY_IE_, &ie_len, (pmlmeinfo->network.IELength - sizeof(NDIS_802_11_FIXED_IEs)));
|
||||
p = rtw_get_ie((pmlmeinfo->network.IEs + sizeof(struct ndis_802_11_fixed_ie)), _HT_CAPABILITY_IE_, &ie_len, (pmlmeinfo->network.IELength - sizeof(struct ndis_802_11_fixed_ie)));
|
||||
if ((p != NULL) && (!(is_ap_in_tkip(padapter)))) {
|
||||
_rtw_memcpy(&(pmlmeinfo->HT_caps), (p + 2), sizeof(struct HT_caps_element));
|
||||
|
||||
|
@ -6201,8 +6201,8 @@ void issue_assocreq(_adapter *padapter)
|
|||
#endif
|
||||
|
||||
/* vendor specific IE, such as WPA, WMM, WPS */
|
||||
for (i = sizeof(NDIS_802_11_FIXED_IEs); i < pmlmeinfo->network.IELength;) {
|
||||
pIE = (PNDIS_802_11_VARIABLE_IEs)(pmlmeinfo->network.IEs + i);
|
||||
for (i = sizeof(struct ndis_802_11_fixed_ie); i < pmlmeinfo->network.IELength;) {
|
||||
pIE = (struct ndis_802_11_var_ie *)(pmlmeinfo->network.IEs + i);
|
||||
|
||||
switch (pIE->ElementID) {
|
||||
case _VENDOR_SPECIFIC_IE_:
|
||||
|
@ -7073,7 +7073,7 @@ static void issue_action_BSSCoexistPacket(_adapter *padapter)
|
|||
{
|
||||
int len;
|
||||
u8 *p;
|
||||
WLAN_BSSID_EX *pbss_network;
|
||||
struct wlan_bssid_ex *pbss_network;
|
||||
|
||||
if (rtw_end_of_queue_search(phead,plist)== true)
|
||||
break;
|
||||
|
@ -7082,7 +7082,7 @@ static void issue_action_BSSCoexistPacket(_adapter *padapter)
|
|||
|
||||
plist = get_next(plist);
|
||||
|
||||
pbss_network = (WLAN_BSSID_EX *)&pnetwork->network;
|
||||
pbss_network = (struct wlan_bssid_ex *)&pnetwork->network;
|
||||
|
||||
p = rtw_get_ie(pbss_network->IEs + _FIXED_IE_LENGTH_, _HT_CAPABILITY_IE_, &len, pbss_network->IELength - _FIXED_IE_LENGTH_);
|
||||
if ((p==NULL) || (len==0))/* non-HT */
|
||||
|
@ -7450,7 +7450,7 @@ void site_survey(_adapter *padapter)
|
|||
}
|
||||
|
||||
/* collect bss info from Beacon and Probe request/response frames. */
|
||||
u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, WLAN_BSSID_EX *bssid)
|
||||
u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, struct wlan_bssid_ex *bssid)
|
||||
{
|
||||
int i;
|
||||
u32 len;
|
||||
|
@ -7469,7 +7469,7 @@ u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, WLAN_BSSI
|
|||
if (len > MAX_IE_SZ)
|
||||
return _FAIL;
|
||||
|
||||
_rtw_memset(bssid, 0, sizeof(WLAN_BSSID_EX));
|
||||
_rtw_memset(bssid, 0, sizeof(struct wlan_bssid_ex));
|
||||
|
||||
subtype = GetFrameSubType(pframe);
|
||||
|
||||
|
@ -7490,7 +7490,7 @@ u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, WLAN_BSSI
|
|||
}
|
||||
}
|
||||
|
||||
bssid->Length = sizeof(WLAN_BSSID_EX) - MAX_IE_SZ + len;
|
||||
bssid->Length = sizeof(struct wlan_bssid_ex) - MAX_IE_SZ + len;
|
||||
|
||||
/* below is to copy the information element */
|
||||
bssid->IELength = len;
|
||||
|
@ -7589,7 +7589,7 @@ u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, WLAN_BSSI
|
|||
_rtw_memcpy(&le32_tmp, rtw_get_beacon_interval_from_ie(bssid->IEs), 2);
|
||||
bssid->Configuration.BeaconPeriod = le32_to_cpu(le32_tmp);
|
||||
|
||||
val16 = rtw_get_capability((WLAN_BSSID_EX *)bssid);
|
||||
val16 = rtw_get_capability((struct wlan_bssid_ex *)bssid);
|
||||
|
||||
if (val16 & BIT(0)) {
|
||||
bssid->InfrastructureMode = Ndis802_11Infrastructure;
|
||||
|
@ -7651,7 +7651,7 @@ void start_create_ibss(_adapter* padapter)
|
|||
u8 join_type;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX*)(&(pmlmeinfo->network));
|
||||
struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex*)(&(pmlmeinfo->network));
|
||||
pmlmeext->cur_channel = (u8)pnetwork->Configuration.DSConfig;
|
||||
pmlmeinfo->bcn_interval = get_beacon_interval(pnetwork);
|
||||
|
||||
|
@ -7659,7 +7659,7 @@ void start_create_ibss(_adapter* padapter)
|
|||
update_wireless_mode(padapter);
|
||||
|
||||
/* udpate capability */
|
||||
caps = rtw_get_capability((WLAN_BSSID_EX *)pnetwork);
|
||||
caps = rtw_get_capability((struct wlan_bssid_ex *)pnetwork);
|
||||
update_capinfo(padapter, caps);
|
||||
if (caps&cap_IBSS)/* adhoc master */
|
||||
{
|
||||
|
@ -7708,7 +7708,7 @@ void start_clnt_join(_adapter* padapter)
|
|||
u8 val8;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX*)(&(pmlmeinfo->network));
|
||||
struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex*)(&(pmlmeinfo->network));
|
||||
int beacon_timeout;
|
||||
|
||||
pmlmeext->cur_channel = (u8)pnetwork->Configuration.DSConfig;
|
||||
|
@ -7718,7 +7718,7 @@ void start_clnt_join(_adapter* padapter)
|
|||
update_wireless_mode(padapter);
|
||||
|
||||
/* udpate capability */
|
||||
caps = rtw_get_capability((WLAN_BSSID_EX *)pnetwork);
|
||||
caps = rtw_get_capability((struct wlan_bssid_ex *)pnetwork);
|
||||
update_capinfo(padapter, caps);
|
||||
if (caps&cap_ESS)
|
||||
{
|
||||
|
@ -7839,7 +7839,7 @@ unsigned int receive_disconnect(_adapter *padapter, unsigned char *MacAddr, unsi
|
|||
return _SUCCESS;
|
||||
}
|
||||
|
||||
static void process_80211d(PADAPTER padapter, WLAN_BSSID_EX *bssid)
|
||||
static void process_80211d(PADAPTER padapter, struct wlan_bssid_ex *bssid)
|
||||
{
|
||||
struct registry_priv *pregistrypriv;
|
||||
struct mlme_ext_priv *pmlmeext;
|
||||
|
@ -8125,7 +8125,7 @@ void report_survey_event(_adapter *padapter, union recv_frame *precv_frame)
|
|||
|
||||
psurvey_evt = (struct survey_event*)(pevtcmd + sizeof(struct C2HEvent_Header));
|
||||
|
||||
if (collect_bss_info(padapter, precv_frame, (WLAN_BSSID_EX *)&psurvey_evt->bss) == _FAIL)
|
||||
if (collect_bss_info(padapter, precv_frame, (struct wlan_bssid_ex *)&psurvey_evt->bss) == _FAIL)
|
||||
{
|
||||
rtw_mfree((u8 *)pcmd_obj, sizeof(struct cmd_obj));
|
||||
rtw_mfree((u8 *)pevtcmd, cmdsz);
|
||||
|
@ -8223,7 +8223,7 @@ void report_join_res(_adapter *padapter, int res)
|
|||
pc2h_evt_hdr->seq = ATOMIC_INC_RETURN(&pmlmeext->event_seq);
|
||||
|
||||
pjoinbss_evt = (struct joinbss_event*)(pevtcmd + sizeof(struct C2HEvent_Header));
|
||||
_rtw_memcpy((unsigned char *)(&(pjoinbss_evt->network.network)), &(pmlmeinfo->network), sizeof(WLAN_BSSID_EX));
|
||||
_rtw_memcpy((unsigned char *)(&(pjoinbss_evt->network.network)), &(pmlmeinfo->network), sizeof(struct wlan_bssid_ex));
|
||||
pjoinbss_evt->network.join_res = pjoinbss_evt->network.aid = res;
|
||||
|
||||
DBG_88E("report_join_res(%d)\n", res);
|
||||
|
@ -8409,7 +8409,7 @@ void mlmeext_joinbss_event_callback(_adapter *padapter, int join_res)
|
|||
struct sta_info *psta, *psta_bmc;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
|
||||
struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network);
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
u8 join_type;
|
||||
u16 media_status;
|
||||
|
@ -8940,7 +8940,7 @@ u8 createbss_hdl(_adapter *padapter, u8 *pbuf)
|
|||
{
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX*)(&(pmlmeinfo->network));
|
||||
struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex*)(&(pmlmeinfo->network));
|
||||
struct joinbss_parm *pparm = (struct joinbss_parm *)pbuf;
|
||||
/* u32 initialgain; */
|
||||
|
||||
|
@ -8986,13 +8986,13 @@ u8 createbss_hdl(_adapter *padapter, u8 *pbuf)
|
|||
/* clear CAM */
|
||||
flush_all_cam_entry(padapter);
|
||||
|
||||
_rtw_memcpy(pnetwork, pbuf, FIELD_OFFSET(WLAN_BSSID_EX, IELength));
|
||||
pnetwork->IELength = ((WLAN_BSSID_EX *)pbuf)->IELength;
|
||||
_rtw_memcpy(pnetwork, pbuf, FIELD_OFFSET(struct wlan_bssid_ex, IELength));
|
||||
pnetwork->IELength = ((struct wlan_bssid_ex *)pbuf)->IELength;
|
||||
|
||||
if (pnetwork->IELength>MAX_IE_SZ)/* Check pbuf->IELength */
|
||||
return H2C_PARAMETERS_ERROR;
|
||||
|
||||
_rtw_memcpy(pnetwork->IEs, ((WLAN_BSSID_EX *)pbuf)->IEs, pnetwork->IELength);
|
||||
_rtw_memcpy(pnetwork->IEs, ((struct wlan_bssid_ex *)pbuf)->IEs, pnetwork->IELength);
|
||||
|
||||
start_create_ibss(padapter);
|
||||
|
||||
|
@ -9005,11 +9005,11 @@ u8 createbss_hdl(_adapter *padapter, u8 *pbuf)
|
|||
u8 join_cmd_hdl(_adapter *padapter, u8 *pbuf)
|
||||
{
|
||||
u8 join_type;
|
||||
PNDIS_802_11_VARIABLE_IEs pIE;
|
||||
struct ndis_802_11_var_ie * pIE;
|
||||
struct registry_priv *pregpriv = &padapter->registrypriv;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX*)(&(pmlmeinfo->network));
|
||||
struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex*)(&(pmlmeinfo->network));
|
||||
struct joinbss_parm *pparm = (struct joinbss_parm *)pbuf;
|
||||
u32 i;
|
||||
|
||||
|
@ -9048,20 +9048,20 @@ u8 join_cmd_hdl(_adapter *padapter, u8 *pbuf)
|
|||
pmlmeinfo->bwmode_updated = false;
|
||||
/* pmlmeinfo->assoc_AP_vendor = HT_IOT_PEER_MAX; */
|
||||
|
||||
_rtw_memcpy(pnetwork, pbuf, FIELD_OFFSET(WLAN_BSSID_EX, IELength));
|
||||
pnetwork->IELength = ((WLAN_BSSID_EX *)pbuf)->IELength;
|
||||
_rtw_memcpy(pnetwork, pbuf, FIELD_OFFSET(struct wlan_bssid_ex, IELength));
|
||||
pnetwork->IELength = ((struct wlan_bssid_ex *)pbuf)->IELength;
|
||||
|
||||
if (pnetwork->IELength>MAX_IE_SZ)/* Check pbuf->IELength */
|
||||
return H2C_PARAMETERS_ERROR;
|
||||
|
||||
_rtw_memcpy(pnetwork->IEs, ((WLAN_BSSID_EX *)pbuf)->IEs, pnetwork->IELength);
|
||||
_rtw_memcpy(pnetwork->IEs, ((struct wlan_bssid_ex *)pbuf)->IEs, pnetwork->IELength);
|
||||
|
||||
/* Check AP vendor to move rtw_joinbss_cmd() */
|
||||
/* pmlmeinfo->assoc_AP_vendor = check_assoc_AP(pnetwork->IEs, pnetwork->IELength); */
|
||||
|
||||
for (i = sizeof(NDIS_802_11_FIXED_IEs); i < pnetwork->IELength;)
|
||||
for (i = sizeof(struct ndis_802_11_fixed_ie); i < pnetwork->IELength;)
|
||||
{
|
||||
pIE = (PNDIS_802_11_VARIABLE_IEs)(pnetwork->IEs + i);
|
||||
pIE = (struct ndis_802_11_var_ie *)(pnetwork->IEs + i);
|
||||
|
||||
switch (pIE->ElementID)
|
||||
{
|
||||
|
@ -9137,7 +9137,7 @@ u8 disconnect_hdl(_adapter *padapter, unsigned char *pbuf)
|
|||
struct disconnect_parm *param = (struct disconnect_parm *)pbuf;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX*)(&(pmlmeinfo->network));
|
||||
struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex*)(&(pmlmeinfo->network));
|
||||
u8 val8;
|
||||
|
||||
if (is_client_associated_to_ap(padapter))
|
||||
|
@ -9487,7 +9487,7 @@ _func_enter_;
|
|||
goto exit;
|
||||
}
|
||||
|
||||
_rtw_memcpy(&(ptxBeacon_parm->network), &(pmlmeinfo->network), sizeof(WLAN_BSSID_EX));
|
||||
_rtw_memcpy(&(ptxBeacon_parm->network), &(pmlmeinfo->network), sizeof(struct wlan_bssid_ex));
|
||||
|
||||
len_diff = update_hidden_ssid(
|
||||
ptxBeacon_parm->network.IEs+_BEACON_IE_OFFSET_
|
||||
|
|
|
@ -96,7 +96,7 @@ void write_rfreg(PADAPTER padapter, u8 rfpath, u32 addr, u32 val)
|
|||
|
||||
static void _init_mp_priv_(struct mp_priv *pmp_priv)
|
||||
{
|
||||
WLAN_BSSID_EX *pnetwork;
|
||||
struct wlan_bssid_ex *pnetwork;
|
||||
|
||||
_rtw_memset(pmp_priv, 0, sizeof(struct mp_priv));
|
||||
|
||||
|
@ -378,7 +378,7 @@ static void disable_dm(PADAPTER padapter)
|
|||
/* This function initializes the DUT to the MP test mode */
|
||||
s32 mp_start_test(PADAPTER padapter)
|
||||
{
|
||||
WLAN_BSSID_EX bssid;
|
||||
struct wlan_bssid_ex bssid;
|
||||
struct sta_info *psta;
|
||||
u32 length;
|
||||
u8 val8;
|
||||
|
@ -424,8 +424,8 @@ s32 mp_start_test(PADAPTER padapter)
|
|||
|
||||
mpt_ProStartTest(padapter);
|
||||
|
||||
/* 3 1. initialize a new WLAN_BSSID_EX */
|
||||
/* _rtw_memset(&bssid, 0, sizeof(WLAN_BSSID_EX)); */
|
||||
/* 3 1. initialize a new struct wlan_bssid_ex */
|
||||
/* _rtw_memset(&bssid, 0, sizeof(struct wlan_bssid_ex)); */
|
||||
_rtw_memcpy(bssid.MacAddress, pmppriv->network_macaddr, ETH_ALEN);
|
||||
bssid.Ssid.SsidLength = strlen("mp_pseudo_adhoc");
|
||||
_rtw_memcpy(bssid.Ssid.Ssid, (u8*)"mp_pseudo_adhoc", bssid.Ssid.SsidLength);
|
||||
|
@ -433,7 +433,7 @@ s32 mp_start_test(PADAPTER padapter)
|
|||
bssid.NetworkTypeInUse = Ndis802_11DS;
|
||||
bssid.IELength = 0;
|
||||
|
||||
length = get_WLAN_BSSID_EX_sz(&bssid);
|
||||
length = get_wlan_bssid_ex_sz(&bssid);
|
||||
if (length % 4)
|
||||
bssid.Length = ((length >> 2) + 1) << 2; /* round up to multiple of 4 bytes. */
|
||||
else
|
||||
|
|
|
@ -1707,12 +1707,12 @@ static void find_phase_handler( _adapter* padapter )
|
|||
{
|
||||
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
NDIS_802_11_SSID ssid;
|
||||
struct ndis_802_11_ssid ssid;
|
||||
_irqL irqL;
|
||||
|
||||
_func_enter_;
|
||||
|
||||
_rtw_memset((unsigned char*)&ssid, 0, sizeof(NDIS_802_11_SSID));
|
||||
_rtw_memset((unsigned char*)&ssid, 0, sizeof(struct ndis_802_11_ssid));
|
||||
_rtw_memcpy(ssid.Ssid, pwdinfo->p2p_wildcard_ssid, P2P_WILDCARD_SSID_LEN );
|
||||
ssid.SsidLength = P2P_WILDCARD_SSID_LEN;
|
||||
|
||||
|
|
|
@ -660,7 +660,7 @@ u32 rtw_init_bcmc_stainfo(_adapter* padapter)
|
|||
|
||||
struct sta_info *psta;
|
||||
u32 res=_SUCCESS;
|
||||
NDIS_802_11_MAC_ADDRESS bcast_addr= {0xff,0xff,0xff,0xff,0xff,0xff};
|
||||
unsigned char bcast_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff};
|
||||
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
/* _queue *pstapending = &padapter->xmitpriv.bm_pending; */
|
||||
|
|
|
@ -492,12 +492,12 @@ int get_bsstype(unsigned short capability)
|
|||
}
|
||||
}
|
||||
|
||||
__inline u8 *get_my_bssid(WLAN_BSSID_EX *pnetwork)
|
||||
__inline u8 *get_my_bssid(struct wlan_bssid_ex *pnetwork)
|
||||
{
|
||||
return (pnetwork->MacAddress);
|
||||
}
|
||||
|
||||
u16 get_beacon_interval(WLAN_BSSID_EX *bss)
|
||||
u16 get_beacon_interval(struct wlan_bssid_ex *bss)
|
||||
{
|
||||
__le16 val;
|
||||
_rtw_memcpy((unsigned char *)&val, rtw_get_beacon_interval_from_ie(bss->IEs), 2);
|
||||
|
@ -669,7 +669,7 @@ void flush_all_cam_entry(_adapter *padapter)
|
|||
_rtw_memset((u8 *)(pmlmeinfo->FW_sta_info), 0, sizeof(pmlmeinfo->FW_sta_info));
|
||||
}
|
||||
|
||||
int WMM_param_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
|
||||
int WMM_param_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE)
|
||||
{
|
||||
/* struct registry_priv *pregpriv = &padapter->registrypriv; */
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
|
@ -805,7 +805,7 @@ void WMMOnAssocRsp(_adapter *padapter)
|
|||
return;
|
||||
}
|
||||
|
||||
static void bwmode_update_check(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
|
||||
static void bwmode_update_check(_adapter *padapter, struct ndis_802_11_var_ie * pIE)
|
||||
{
|
||||
#ifdef CONFIG_80211N_HT
|
||||
unsigned char new_bwmode;
|
||||
|
@ -872,7 +872,7 @@ static void bwmode_update_check(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pI
|
|||
if (true == pmlmeinfo->bwmode_updated)
|
||||
{
|
||||
struct sta_info *psta;
|
||||
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
|
||||
struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network);
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
|
||||
/* set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); */
|
||||
|
@ -900,7 +900,7 @@ static void bwmode_update_check(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pI
|
|||
#endif /* CONFIG_80211N_HT */
|
||||
}
|
||||
|
||||
void HT_caps_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
|
||||
void HT_caps_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE)
|
||||
{
|
||||
#ifdef CONFIG_80211N_HT
|
||||
unsigned int i;
|
||||
|
@ -964,7 +964,7 @@ void HT_caps_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
|
|||
return;
|
||||
}
|
||||
|
||||
void HT_info_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
|
||||
void HT_info_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE)
|
||||
{
|
||||
#ifdef CONFIG_80211N_HT
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
|
@ -1021,7 +1021,7 @@ void HTOnAssocRsp(_adapter *padapter)
|
|||
rtw_hal_set_hwreg(padapter, HW_VAR_AMPDU_FACTOR, (u8 *)(&max_AMPDU_len));
|
||||
}
|
||||
|
||||
void ERP_IE_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
|
||||
void ERP_IE_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE)
|
||||
{
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
|
@ -1092,7 +1092,7 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
|
|||
/* u8 wpa_ie[255],rsn_ie[255]; */
|
||||
u16 wpa_len=0,rsn_len=0;
|
||||
u8 encryp_protocol = 0;
|
||||
WLAN_BSSID_EX *bssid;
|
||||
struct wlan_bssid_ex *bssid;
|
||||
int group_cipher = 0, pairwise_cipher = 0, is_8021x = 0;
|
||||
unsigned char *pbuf;
|
||||
u32 wpa_ielen = 0;
|
||||
|
@ -1121,14 +1121,14 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
|
|||
return true;
|
||||
}
|
||||
|
||||
bssid = (WLAN_BSSID_EX *)rtw_zmalloc(sizeof(WLAN_BSSID_EX));
|
||||
bssid = (struct wlan_bssid_ex *)rtw_zmalloc(sizeof(struct wlan_bssid_ex));
|
||||
|
||||
subtype = GetFrameSubType(pframe) >> 4;
|
||||
|
||||
if (subtype==WIFI_BEACON)
|
||||
bssid->Reserved[0] = 1;
|
||||
|
||||
bssid->Length = sizeof(WLAN_BSSID_EX) - MAX_IE_SZ + len;
|
||||
bssid->Length = sizeof(struct wlan_bssid_ex) - MAX_IE_SZ + len;
|
||||
|
||||
/* below is to copy the information element */
|
||||
bssid->IELength = len;
|
||||
|
@ -1216,7 +1216,7 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
|
|||
}
|
||||
|
||||
/* check encryption info */
|
||||
val16 = rtw_get_capability((WLAN_BSSID_EX *)bssid);
|
||||
val16 = rtw_get_capability((struct wlan_bssid_ex *)bssid);
|
||||
|
||||
if (val16 & BIT(4))
|
||||
bssid->Privacy = 1;
|
||||
|
@ -1282,11 +1282,11 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
|
|||
}
|
||||
}
|
||||
|
||||
rtw_mfree((u8 *)bssid, sizeof(WLAN_BSSID_EX));
|
||||
rtw_mfree((u8 *)bssid, sizeof(struct wlan_bssid_ex));
|
||||
return _SUCCESS;
|
||||
|
||||
_mismatch:
|
||||
rtw_mfree((u8 *)bssid, sizeof(WLAN_BSSID_EX));
|
||||
rtw_mfree((u8 *)bssid, sizeof(struct wlan_bssid_ex));
|
||||
return _FAIL;
|
||||
|
||||
_func_exit_;
|
||||
|
@ -1296,13 +1296,13 @@ void update_beacon_info(_adapter *padapter, u8 *pframe, uint pkt_len, struct sta
|
|||
{
|
||||
unsigned int i;
|
||||
unsigned int len;
|
||||
PNDIS_802_11_VARIABLE_IEs pIE;
|
||||
struct ndis_802_11_var_ie * pIE;
|
||||
|
||||
len = pkt_len - (_BEACON_IE_OFFSET_ + WLAN_HDR_A3_LEN);
|
||||
|
||||
for (i = 0; i < len;)
|
||||
{
|
||||
pIE = (PNDIS_802_11_VARIABLE_IEs)(pframe + (_BEACON_IE_OFFSET_ + WLAN_HDR_A3_LEN) + i);
|
||||
pIE = (struct ndis_802_11_var_ie *)(pframe + (_BEACON_IE_OFFSET_ + WLAN_HDR_A3_LEN) + i);
|
||||
|
||||
switch (pIE->ElementID)
|
||||
{
|
||||
|
@ -1326,16 +1326,16 @@ void update_beacon_info(_adapter *padapter, u8 *pframe, uint pkt_len, struct sta
|
|||
unsigned int is_ap_in_tkip(_adapter *padapter)
|
||||
{
|
||||
u32 i;
|
||||
PNDIS_802_11_VARIABLE_IEs pIE;
|
||||
struct ndis_802_11_var_ie * pIE;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
|
||||
struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network);
|
||||
|
||||
if (rtw_get_capability((WLAN_BSSID_EX *)cur_network) & WLAN_CAPABILITY_PRIVACY)
|
||||
if (rtw_get_capability((struct wlan_bssid_ex *)cur_network) & WLAN_CAPABILITY_PRIVACY)
|
||||
{
|
||||
for (i = sizeof(NDIS_802_11_FIXED_IEs); i < pmlmeinfo->network.IELength;)
|
||||
for (i = sizeof(struct ndis_802_11_fixed_ie); i < pmlmeinfo->network.IELength;)
|
||||
{
|
||||
pIE = (PNDIS_802_11_VARIABLE_IEs)(pmlmeinfo->network.IEs + i);
|
||||
pIE = (struct ndis_802_11_var_ie *)(pmlmeinfo->network.IEs + i);
|
||||
|
||||
switch (pIE->ElementID)
|
||||
{
|
||||
|
@ -1371,15 +1371,15 @@ unsigned int is_ap_in_tkip(_adapter *padapter)
|
|||
unsigned int should_forbid_n_rate(_adapter * padapter)
|
||||
{
|
||||
u32 i;
|
||||
PNDIS_802_11_VARIABLE_IEs pIE;
|
||||
struct ndis_802_11_var_ie * pIE;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
WLAN_BSSID_EX *cur_network = &pmlmepriv->cur_network.network;
|
||||
struct wlan_bssid_ex *cur_network = &pmlmepriv->cur_network.network;
|
||||
|
||||
if (rtw_get_capability((WLAN_BSSID_EX *)cur_network) & WLAN_CAPABILITY_PRIVACY)
|
||||
if (rtw_get_capability((struct wlan_bssid_ex *)cur_network) & WLAN_CAPABILITY_PRIVACY)
|
||||
{
|
||||
for (i = sizeof(NDIS_802_11_FIXED_IEs); i < cur_network->IELength;)
|
||||
for (i = sizeof(struct ndis_802_11_fixed_ie); i < cur_network->IELength;)
|
||||
{
|
||||
pIE = (PNDIS_802_11_VARIABLE_IEs)(cur_network->IEs + i);
|
||||
pIE = (struct ndis_802_11_var_ie *)(cur_network->IEs + i);
|
||||
|
||||
switch (pIE->ElementID)
|
||||
{
|
||||
|
@ -1415,16 +1415,16 @@ unsigned int should_forbid_n_rate(_adapter * padapter)
|
|||
unsigned int is_ap_in_wep(_adapter *padapter)
|
||||
{
|
||||
u32 i;
|
||||
PNDIS_802_11_VARIABLE_IEs pIE;
|
||||
struct ndis_802_11_var_ie * pIE;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
|
||||
struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network);
|
||||
|
||||
if (rtw_get_capability((WLAN_BSSID_EX *)cur_network) & WLAN_CAPABILITY_PRIVACY)
|
||||
if (rtw_get_capability((struct wlan_bssid_ex *)cur_network) & WLAN_CAPABILITY_PRIVACY)
|
||||
{
|
||||
for (i = sizeof(NDIS_802_11_FIXED_IEs); i < pmlmeinfo->network.IELength;)
|
||||
for (i = sizeof(struct ndis_802_11_fixed_ie); i < pmlmeinfo->network.IELength;)
|
||||
{
|
||||
pIE = (PNDIS_802_11_VARIABLE_IEs)(pmlmeinfo->network.IEs + i);
|
||||
pIE = (struct ndis_802_11_var_ie *)(pmlmeinfo->network.IEs + i);
|
||||
|
||||
switch (pIE->ElementID)
|
||||
{
|
||||
|
@ -1627,7 +1627,7 @@ void set_sta_rate(_adapter *padapter, struct sta_info *psta)
|
|||
/* Update RRSR and Rate for USERATE */
|
||||
void update_tx_basic_rate(_adapter *padapter, u8 wirelessmode)
|
||||
{
|
||||
NDIS_802_11_RATES_EX supported_rates;
|
||||
unsigned char supported_rates[NDIS_802_11_LENGTH_RATES_EX];
|
||||
#ifdef CONFIG_P2P
|
||||
struct wifidirect_info* pwdinfo = &padapter->wdinfo;
|
||||
|
||||
|
@ -1658,15 +1658,15 @@ void update_tx_basic_rate(_adapter *padapter, u8 wirelessmode)
|
|||
unsigned char check_assoc_AP(u8 *pframe, uint len)
|
||||
{
|
||||
unsigned int i;
|
||||
PNDIS_802_11_VARIABLE_IEs pIE;
|
||||
struct ndis_802_11_var_ie * pIE;
|
||||
u8 epigram_vendor_flag;
|
||||
u8 ralink_vendor_flag;
|
||||
epigram_vendor_flag = 0;
|
||||
ralink_vendor_flag = 0;
|
||||
|
||||
for (i = sizeof(NDIS_802_11_FIXED_IEs); i < len;)
|
||||
for (i = sizeof(struct ndis_802_11_fixed_ie); i < len;)
|
||||
{
|
||||
pIE = (PNDIS_802_11_VARIABLE_IEs)(pframe + i);
|
||||
pIE = (struct ndis_802_11_var_ie *)(pframe + i);
|
||||
|
||||
switch (pIE->ElementID)
|
||||
{
|
||||
|
@ -1854,15 +1854,13 @@ void update_wireless_mode(_adapter *padapter)
|
|||
u32 SIFS_Timer;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
|
||||
unsigned char *rate = cur_network->SupportedRates;
|
||||
struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network);
|
||||
unsigned char *rate = cur_network->SupportedRates;
|
||||
|
||||
ratelen = rtw_get_rateset_len(cur_network->SupportedRates);
|
||||
|
||||
if ((pmlmeinfo->HT_info_enable) && (pmlmeinfo->HT_caps_enable))
|
||||
{
|
||||
pmlmeinfo->HT_enable = 1;
|
||||
}
|
||||
|
||||
if (pmlmeext->cur_channel > 14)
|
||||
{
|
||||
|
@ -1926,12 +1924,12 @@ void update_bmc_sta_support_rate(_adapter *padapter, u32 mac_id)
|
|||
int update_sta_support_rate(_adapter *padapter, u8* pvar_ie, uint var_ie_len, int cam_idx)
|
||||
{
|
||||
unsigned int ie_len;
|
||||
PNDIS_802_11_VARIABLE_IEs pIE;
|
||||
struct ndis_802_11_var_ie * pIE;
|
||||
int supportRateNum = 0;
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
|
||||
pIE = (PNDIS_802_11_VARIABLE_IEs)rtw_get_ie(pvar_ie, _SUPPORTEDRATES_IE_, &ie_len, var_ie_len);
|
||||
pIE = (struct ndis_802_11_var_ie *)rtw_get_ie(pvar_ie, _SUPPORTEDRATES_IE_, &ie_len, var_ie_len);
|
||||
if (pIE == NULL)
|
||||
{
|
||||
return _FAIL;
|
||||
|
@ -1940,7 +1938,7 @@ int update_sta_support_rate(_adapter *padapter, u8* pvar_ie, uint var_ie_len, in
|
|||
_rtw_memcpy(pmlmeinfo->FW_sta_info[cam_idx].SupportedRates, pIE->data, ie_len);
|
||||
supportRateNum = ie_len;
|
||||
|
||||
pIE = (PNDIS_802_11_VARIABLE_IEs)rtw_get_ie(pvar_ie, _EXT_SUPPORTEDRATES_IE_, &ie_len, var_ie_len);
|
||||
pIE = (struct ndis_802_11_var_ie *)rtw_get_ie(pvar_ie, _EXT_SUPPORTEDRATES_IE_, &ie_len, var_ie_len);
|
||||
if (pIE)
|
||||
{
|
||||
_rtw_memcpy((pmlmeinfo->FW_sta_info[cam_idx].SupportedRates + supportRateNum), pIE->data, ie_len);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue