mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-05-09 14:53:05 +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:
Larry Finger
parent
3c0fdf5c36
commit
a01908ab27
29 changed files with 411 additions and 495 deletions
|
|
@ -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_
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue