diff --git a/core/rtw_ap.c b/core/rtw_ap.c index 64f8707..05f7eb1 100755 --- a/core/rtw_ap.c +++ b/core/rtw_ap.c @@ -1291,7 +1291,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) HT_info_handler(padapter, (PNDIS_802_11_VARIABLE_IEs)pHT_info_ie); } - pbss_network->Length = get_WLAN_BSSID_EX_sz((WLAN_BSSID_EX *)pbss_network); + pbss_network->Length = get_wlan_bssid_ex_sz((WLAN_BSSID_EX *)pbss_network); /* issue beacon to start bss network */ start_bss_network(padapter, (u8*)pbss_network); diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c index 82134f1..8c9095a 100755 --- a/core/rtw_cmd.c +++ b/core/rtw_cmd.c @@ -1052,7 +1052,7 @@ u8 rtw_createbss_cmd(struct adapter *padapter) _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((WLAN_BSSID_EX*)pdev_network); pcmd->rsp = NULL; pcmd->rspsz = 0; @@ -1169,7 +1169,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network* pnetwork) memset(psecnetwork, 0, t_len); - memcpy(psecnetwork, &pnetwork->network, get_WLAN_BSSID_EX_sz(&pnetwork->network)); + memcpy(psecnetwork, &pnetwork->network, get_wlan_bssid_ex_sz(&pnetwork->network)); auth=&psecuritypriv->authenticator_ie[0]; psecuritypriv->authenticator_ie[0]=(unsigned char)psecnetwork->IELength; @@ -1237,7 +1237,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network* pnetwork) DBG_871X("%s: smart_ps=%d\n", __func__, adapter_to_pwrctl(padapter)->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) */ @@ -2887,14 +2887,14 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) 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); 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 */ - memcpy(&tgt_network->network, pnetwork, (get_WLAN_BSSID_EX_sz(pnetwork))); + memcpy(&tgt_network->network, pnetwork, (get_wlan_bssid_ex_sz(pnetwork))); /* reset DSConfig */ /* tgt_network->network.Configuration.DSConfig = (u32)rtw_ch2freq(pnetwork->Configuration.DSConfig); */ diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index d6b4125..76b6832 100755 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -698,7 +698,7 @@ void update_network(WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src, if (update_ie) { dst->Reserved[0] = src->Reserved[0]; dst->Reserved[1] = src->Reserved[1]; - memcpy((u8 *)dst, (u8 *)src, get_WLAN_BSSID_EX_sz(src)); + memcpy((u8 *)dst, (u8 *)src, get_wlan_bssid_ex_sz(src)); } dst->PhyInfo.SignalStrength = ss_final; @@ -802,7 +802,7 @@ void rtw_update_scanned_network(struct adapter *adapter, WLAN_BSSID_EX *target) pnetwork = oldest; rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(target->PhyInfo.Optimum_antenna)); - memcpy(&(pnetwork->network), target, get_WLAN_BSSID_EX_sz(target)); + memcpy(&(pnetwork->network), target, get_wlan_bssid_ex_sz(target)); /* pnetwork->last_scanned = rtw_get_current_time(); */ /* variable initialize */ pnetwork->fixed = false; @@ -826,7 +826,7 @@ void rtw_update_scanned_network(struct adapter *adapter, WLAN_BSSID_EX *target) 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)); memcpy(&(pnetwork->network), target, bssid_ex_sz ); @@ -985,7 +985,7 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *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); + len = get_wlan_bssid_ex_sz(pnetwork); if(len > (sizeof(WLAN_BSSID_EX))) { RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n ****rtw_survey_event_callback: return a wrong bss ***\n")); @@ -1630,7 +1630,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) the_same_macaddr = _rtw_memcmp(pnetwork->network.MacAddress, cur_network->network.MacAddress, ETH_ALEN); - pnetwork->network.Length = get_WLAN_BSSID_EX_sz(&pnetwork->network); + pnetwork->network.Length = get_wlan_bssid_ex_sz(&pnetwork->network); if(pnetwork->network.Length > sizeof(WLAN_BSSID_EX)) { RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n\n ***joinbss_evt_callback return a wrong bss ***\n\n")); goto ignore_joinbss_callback; @@ -2030,7 +2030,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) pdev_network = &(adapter->registrypriv.dev_network); pibss = adapter->registrypriv.dev_network.MacAddress; - memcpy(pdev_network, &tgt_network->network, get_WLAN_BSSID_EX_sz(&tgt_network->network)); + memcpy(pdev_network, &tgt_network->network, get_wlan_bssid_ex_sz(&tgt_network->network)); memset(&pdev_network->Ssid, 0, sizeof(NDIS_802_11_SSID)); memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(NDIS_802_11_SSID)); @@ -2818,7 +2818,7 @@ void rtw_update_registrypriv_dev_network(struct adapter* adapter) 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((WLAN_BSSID_EX *)pdev_network); } void rtw_get_encrypt_decrypt_from_registrypriv(struct adapter* adapter) diff --git a/include/wlan_bssdef.h b/include/wlan_bssdef.h index 69ec661..2771b72 100755 --- a/include/wlan_bssdef.h +++ b/include/wlan_bssdef.h @@ -292,7 +292,7 @@ typedef struct _WLAN_BCN_INFO }WLAN_BCN_INFO,*PWLAN_BCN_INFO; /* temporally add #pragma pack for structure alignment issue of -* WLAN_BSSID_EX and get_WLAN_BSSID_EX_sz() +* WLAN_BSSID_EX and get_wlan_bssid_ex_sz() */ typedef struct _WLAN_BSSID_EX { @@ -313,7 +313,7 @@ typedef struct _WLAN_BSSID_EX __attribute__((packed)) WLAN_BSSID_EX, *PWLAN_BSSID_EX; -__inline static uint get_WLAN_BSSID_EX_sz(WLAN_BSSID_EX *bss) +__inline static uint get_wlan_bssid_ex_sz(WLAN_BSSID_EX *bss) { return (sizeof(WLAN_BSSID_EX) -MAX_IE_SZ + bss->IELength); } diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c index 5f6335b..5aa43d4 100755 --- a/os_dep/ioctl_linux.c +++ b/os_dep/ioctl_linux.c @@ -9066,7 +9066,7 @@ static s32 createpseudoadhoc(struct adapter *padapter) /* 3 join psudo AdHoc */ pcur_network->join_res = 1; pcur_network->aid = psta->aid = 1; - memcpy(&pcur_network->network, pdev_network, get_WLAN_BSSID_EX_sz(pdev_network)); + memcpy(&pcur_network->network, pdev_network, get_wlan_bssid_ex_sz(pdev_network)); { u8 val8;