skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-05-08 14:33:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove typedef statements from include/wlan_bssdef.h

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-03-14 18:14:05 -05:00
parent 8a5e5024c0
commit 851dc8fff5
20 changed files with 259 additions and 414 deletions
Download patch file Download diff file Expand all files Collapse all files

18
core/rtw_ap.c
View file

@ -197,15 +197,15 @@ static void update_BCNTIM(struct adapter *padapter)
void rtw_add_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index, u8 *data, u8 len)
{
PNDIS_802_11_VARIABLE_IEs pIE;
struct ndis_802_11_variable_ies * 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;)
for (i = sizeof(struct ndis_802_11_fixed_ies); i < pnetwork->IELength;)
{
pIE = (PNDIS_802_11_VARIABLE_IEs)(pnetwork->IEs + i);
pIE = (struct ndis_802_11_variable_ies *)(pnetwork->IEs + i);
if (pIE->ElementID > index)
{
@ -924,7 +924,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf)
Switch_DM_Func(padapter, DYNAMIC_ALL_FUNC_ENABLE, true);
}
/* 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_ies)), _HT_ADD_INFO_IE_, &ie_len, (pnetwork->IELength - sizeof(struct ndis_802_11_fixed_ies)));
if( p && ie_len)
{
pht_info = (struct HT_info_element *)(p+2);
@ -1065,7 +1065,7 @@ int rtw_check_beacon_data(struct 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)
{
memset(&pbss_network->Ssid, 0, sizeof(NDIS_802_11_SSID));
memset(&pbss_network->Ssid, 0, sizeof(struct ndis_802_11_ssid));
memcpy(pbss_network->Ssid.Ssid, (p + 2), ie_len);
pbss_network->Ssid.SsidLength = ie_len;
}
@ -1107,7 +1107,7 @@ int rtw_check_beacon_data(struct 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_variable_ies *)p);
}
/* update privacy/security */
@ -1287,9 +1287,9 @@ int rtw_check_beacon_data(struct 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_variable_ies *)pHT_caps_ie);
HT_info_handler(padapter, (PNDIS_802_11_VARIABLE_IEs)pHT_info_ie);
HT_info_handler(padapter, (struct ndis_802_11_variable_ies *)pHT_info_ie);
}
pbss_network->Length = get_wlan_bssid_ex_sz((struct wlan_bssid_ex *)pbss_network);
@ -1470,7 +1470,7 @@ static void update_bcn_erpinfo_ie(struct 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_variable_ies * pIE = (struct ndis_802_11_variable_ies *)p;
if (pmlmepriv->num_sta_non_erp == 1)
pIE->data[0] |= RTW_ERP_INFO_NON_ERP_PRESENT|RTW_ERP_INFO_USE_PROTECTION;

8
core/rtw_cmd.c
View file

@ -540,7 +540,7 @@ rtw_sitesurvey_cmd(~)
### NOTE:#### (!!!!)
MUST TAKE CARE THAT BEFORE CALLING THIS FUNC, YOU SHOULD HAVE LOCKED pmlmepriv->lock
*/
u8 rtw_sitesurvey_cmd(struct adapter *padapter, NDIS_802_11_SSID *ssid, int ssid_num,
u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid, int ssid_num,
struct rtw_ieee80211_channel *ch, int ch_num)
{
u8 res = _FAIL;
@ -586,7 +586,7 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, NDIS_802_11_SSID *ssid, int ssi
int i;
for (i=0; i<ssid_num && i< RTW_SSID_SCAN_AMOUNT; i++) {
if (ssid[i].SsidLength) {
memcpy(&psurveyPara->ssid[i], &ssid[i], sizeof(NDIS_802_11_SSID));
memcpy(&psurveyPara->ssid[i], &ssid[i], sizeof(struct ndis_802_11_ssid));
psurveyPara->ssid_num++;
}
}
@ -981,7 +981,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network* pnetwork)
struct security_priv *psecuritypriv=&padapter->securitypriv;
struct registry_priv *pregistrypriv = &padapter->registrypriv;
struct ht_priv *phtpriv = &pmlmepriv->htpriv;
NDIS_802_11_NETWORK_INFRASTRUCTURE ndis_network_mode = pnetwork->network.InfrastructureMode;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE ndis_network_mode = pnetwork->network.InfrastructureMode;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -1169,7 +1169,7 @@ exit:
return res;
}
u8 rtw_setopmode_cmd(struct adapter *padapter, NDIS_802_11_NETWORK_INFRASTRUCTURE networktype, bool enqueue)
u8 rtw_setopmode_cmd(struct adapter *padapter, enum NDIS_802_11_NETWORK_INFRASTRUCTURE networktype, bool enqueue)
{
struct cmd_obj* ph2c;
struct setopmode_parm* psetop;

8
core/rtw_ieee80211.c
View file

@ -1345,14 +1345,14 @@ void dump_wps_ie(u8 *ie, u32 ie_len)
*/
u32 rtw_get_p2p_merged_ies_len(u8 *in_ie, u32 in_len)
{
PNDIS_802_11_VARIABLE_IEs pIE;
struct ndis_802_11_variable_ies * pIE;
u8 OUI[4] = { 0x50, 0x6f, 0x9a, 0x09 };
int i=0;
int j=0, len=0;
while( i < in_len)
{
pIE = (PNDIS_802_11_VARIABLE_IEs)(in_ie+ i);
pIE = (struct ndis_802_11_variable_ies *)(in_ie+ i);
if( pIE->ElementID == _VENDOR_SPECIFIC_IE_ && _rtw_memcmp(pIE->data, OUI, 4) )
{
@ -1374,7 +1374,7 @@ u32 rtw_get_p2p_merged_ies_len(u8 *in_ie, u32 in_len)
*/
int rtw_p2p_merge_ies(u8 *in_ie, u32 in_len, u8 *merge_ie)
{
PNDIS_802_11_VARIABLE_IEs pIE;
struct ndis_802_11_variable_ies * pIE;
u8 len = 0;
u8 OUI[4] = { 0x50, 0x6f, 0x9a, 0x09 };
u8 ELOUI[6] = { 0xDD, 0x00, 0x50, 0x6f, 0x9a, 0x09 }; /* EID;Len;OUI, Len would copy at the end of function */
@ -1388,7 +1388,7 @@ int rtw_p2p_merge_ies(u8 *in_ie, u32 in_len, u8 *merge_ie)
while( i < in_len)
{
pIE = (PNDIS_802_11_VARIABLE_IEs)(in_ie+ i);
pIE = (struct ndis_802_11_variable_ies *)(in_ie+ i);
/* Take out the rest of P2P OUIs */
if( pIE->ElementID == _VENDOR_SPECIFIC_IE_ && _rtw_memcmp(pIE->data, OUI, 4) )

36
core/rtw_ioctl_set.c
View file

@ -51,7 +51,7 @@ u8 rtw_validate_bssid(u8 *bssid)
return ret;
}
u8 rtw_validate_ssid(NDIS_802_11_SSID *ssid)
u8 rtw_validate_ssid(struct ndis_802_11_ssid *ssid)
{
u8 i;
u8 ret=true;
@ -158,8 +158,8 @@ u8 rtw_do_join(struct adapter * padapter)
pibss = padapter->registrypriv.dev_network.MacAddress;
memset(&pdev_network->Ssid, 0, sizeof(NDIS_802_11_SSID));
memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(NDIS_802_11_SSID));
memset(&pdev_network->Ssid, 0, sizeof(struct ndis_802_11_ssid));
memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndis_802_11_ssid));
rtw_update_registrypriv_dev_network(padapter);
@ -294,7 +294,7 @@ exit:
return status;
}
u8 rtw_set_802_11_ssid(struct adapter* padapter, NDIS_802_11_SSID *ssid)
u8 rtw_set_802_11_ssid(struct adapter* padapter, struct ndis_802_11_ssid *ssid)
{
_irqL irqL;
u8 status = _SUCCESS;
@ -387,7 +387,7 @@ handle_tkip_countermeasure:
goto release_mlme_lock;
}
memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(NDIS_802_11_SSID));
memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(struct ndis_802_11_ssid));
pmlmepriv->assoc_by_bssid=false;
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) {
@ -410,7 +410,7 @@ exit:
}
u8 rtw_set_802_11_connect(struct adapter* padapter, u8 *bssid, NDIS_802_11_SSID *ssid)
u8 rtw_set_802_11_connect(struct adapter* padapter, u8 *bssid, struct ndis_802_11_ssid *ssid)
{
_irqL irqL;
u8 status = _SUCCESS;
@ -459,7 +459,7 @@ handle_tkip_countermeasure:
}
if (ssid && ssid_valid)
memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(NDIS_802_11_SSID));
memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(struct ndis_802_11_ssid));
if (bssid && bssid_valid) {
memcpy(&pmlmepriv->assoc_bssid, bssid, ETH_ALEN);
@ -484,12 +484,12 @@ exit:
}
u8 rtw_set_802_11_infrastructure_mode(struct adapter* padapter,
NDIS_802_11_NETWORK_INFRASTRUCTURE networktype)
enum NDIS_802_11_NETWORK_INFRASTRUCTURE 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_INFRASTRUCTURE* pold_state = &(cur_network->network.InfrastructureMode);
;
@ -588,7 +588,7 @@ u8 rtw_set_802_11_disassociate(struct adapter *padapter)
return true;
}
u8 rtw_set_802_11_bssid_list_scan(struct adapter* padapter, NDIS_802_11_SSID *pssid, int ssid_max_num)
u8 rtw_set_802_11_bssid_list_scan(struct adapter* padapter, struct ndis_802_11_ssid *pssid, int ssid_max_num)
{
_irqL irqL;
struct mlme_priv *pmlmepriv= &padapter->mlmepriv;
@ -638,7 +638,7 @@ exit:
return res;
}
u8 rtw_set_802_11_authentication_mode(struct adapter* padapter, NDIS_802_11_AUTHENTICATION_MODE authmode)
u8 rtw_set_802_11_authentication_mode(struct adapter* padapter, enum NDIS_802_11_AUTHENTICATION_MODE authmode)
{
struct security_priv *psecuritypriv = &padapter->securitypriv;
int res;
@ -663,7 +663,7 @@ u8 rtw_set_802_11_authentication_mode(struct adapter* padapter, NDIS_802_11_AUTH
return ret;
}
u8 rtw_set_802_11_add_wep(struct adapter* padapter, NDIS_802_11_WEP *wep){
u8 rtw_set_802_11_add_wep(struct adapter* padapter, struct ndis_802_11_wep *wep){
u8 bdefaultkey;
u8 btransmitkey;
@ -771,7 +771,7 @@ exit:
}
u8 rtw_set_802_11_add_key(struct adapter* padapter, NDIS_802_11_KEY *key){
u8 rtw_set_802_11_add_key(struct adapter* padapter, struct ndis_802_11_key *key){
uint encryptionalgo;
u8 * pbssid;
@ -963,8 +963,8 @@ u8 rtw_set_802_11_add_key(struct adapter* padapter, NDIS_802_11_KEY *key){
{
u8 ret;
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"));
@ -992,12 +992,12 @@ u8 rtw_set_802_11_add_key(struct adapter* padapter, NDIS_802_11_KEY *key){
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;
memcpy(&padapter->securitypriv.dot11Grprxpn, &keysrc, 8);
}
else
{
NDIS_802_11_KEY_RSC keysrc=key->KeyRSC & 0x00FFFFFFFFFFFFULL;
unsigned long long keysrc=key->KeyRSC & 0x00FFFFFFFFFFFFULL;
memcpy(&padapter->securitypriv.dot11Grptxpn, &keysrc, 8);
}
@ -1133,7 +1133,7 @@ exit:
return ret;
}
u8 rtw_set_802_11_remove_key(struct adapter* padapter, NDIS_802_11_REMOVE_KEY *key){
u8 rtw_set_802_11_remove_key(struct adapter* padapter, struct ndis_802_11_remove_key *key){
uint encryptionalgo;
u8 * pbssid;

24
core/rtw_mlme.c
View file

@ -65,7 +65,7 @@ sint _rtw_init_mlme_priv (struct adapter* padapter)
set_scanned_network_val(pmlmepriv, 0);
memset(&pmlmepriv->assoc_ssid,0,sizeof(NDIS_802_11_SSID));
memset(&pmlmepriv->assoc_ssid,0,sizeof(struct ndis_802_11_ssid));
pbuf = rtw_zvmalloc(MAX_BSS_CNT * (sizeof(struct wlan_network)));
@ -723,7 +723,7 @@ static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex
if ( (check_fwstate(pmlmepriv, _FW_LINKED)== true) && (is_same_network(&(pmlmepriv->cur_network.network), pnetwork, 0)))
{
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_ies),
pmlmepriv->cur_network.network.IELength);
}
@ -1107,8 +1107,8 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("switching to adhoc master\n"));
memset(&pdev_network->Ssid, 0, sizeof(NDIS_802_11_SSID));
memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(NDIS_802_11_SSID));
memset(&pdev_network->Ssid, 0, sizeof(struct ndis_802_11_ssid));
memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndis_802_11_ssid));
rtw_update_registrypriv_dev_network(adapter);
rtw_generate_random_ibss(pibss);
@ -1578,7 +1578,7 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("Invalid network_mode\n"));
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_ies),
(cur_network->network.IELength));
rtw_update_ht_cap(padapter, cur_network->network.IEs, cur_network->network.IELength);
}
@ -2018,8 +2018,8 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
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));
memset(&pdev_network->Ssid, 0, sizeof(struct ndis_802_11_ssid));
memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndis_802_11_ssid));
rtw_update_registrypriv_dev_network(adapter);
@ -2724,9 +2724,9 @@ void rtw_init_registrypriv_dev_network( struct adapter* adapter)
memcpy(pdev_network->MacAddress, myhwaddr, ETH_ALEN);
memcpy(&pdev_network->Ssid, &pregistrypriv->ssid, sizeof(NDIS_802_11_SSID));
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_configuration);
pdev_network->Configuration.BeaconPeriod = 100;
pdev_network->Configuration.FHConfig.Length = 0;
pdev_network->Configuration.FHConfig.HopPattern = 0;
@ -2949,7 +2949,7 @@ void rtw_update_ht_cap(struct 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_ies), _HT_CAPABILITY_IE_, &len, ie_len-sizeof (struct ndis_802_11_fixed_ies));
if(p && len>0)
{
pht_capie = (struct rtw_ieee80211_ht_cap *)(p+2);
@ -2963,7 +2963,7 @@ void rtw_update_ht_cap(struct 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_ies), _HT_ADD_INFO_IE_, &len, ie_len-sizeof (struct ndis_802_11_fixed_ies));
if(p && len>0)
{
pht_addtinfo = (struct ieee80211_ht_addt_info *)(p+2);
@ -3110,7 +3110,7 @@ void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network)
DBG_871X("roaming from %s("MAC_FMT"), length:%d\n",
pnetwork->network.Ssid.Ssid, MAC_ARG(pnetwork->network.MacAddress),
pnetwork->network.Ssid.SsidLength);
memcpy(&pmlmepriv->assoc_ssid, &pnetwork->network.Ssid, sizeof(NDIS_802_11_SSID));
memcpy(&pmlmepriv->assoc_ssid, &pnetwork->network.Ssid, sizeof(struct ndis_802_11_ssid));
pmlmepriv->assoc_by_bssid = false;

32
core/rtw_mlme_ext.c
View file

@ -1889,14 +1889,14 @@ unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_frame)
uint i;
int res;
unsigned short status;
PNDIS_802_11_VARIABLE_IEs pIE;
struct ndis_802_11_variable_ies * pIE;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
/* 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_variable_ies * pWapiIE = NULL;
DBG_871X("%s\n", __FUNCTION__);
@ -1935,7 +1935,7 @@ unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_frame)
/* 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_variable_ies *)(pframe + i);
switch (pIE->ElementID)
{
@ -6202,7 +6202,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p
}
static int _issue_probereq(struct adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da, int wait_ack)
static int _issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da, int wait_ack)
{
int ret = _FAIL;
struct xmit_frame *pmgntframe;
@ -6303,12 +6303,12 @@ exit:
return ret;
}
inline void issue_probereq(struct adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da)
inline void issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da)
{
_issue_probereq(padapter, pssid, da, false);
}
int issue_probereq_ex(struct adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da,
int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da,
int try_cnt, int wait_ms)
{
int ret;
@ -6652,7 +6652,7 @@ void issue_assocreq(struct adapter *padapter)
__le16 val16;
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_variable_ies * pIE;
struct registry_priv *pregpriv = &padapter->registrypriv;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -6785,13 +6785,13 @@ void issue_assocreq(struct 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_ies)), _RSN_IE_2_, &ie_len, (pmlmeinfo->network.IELength - sizeof(struct ndis_802_11_fixed_ies)));
if (p != NULL)
pframe = rtw_set_ie(pframe, _RSN_IE_2_, ie_len, (p + 2), &(pattrib->pktlen));
/* 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_ies)), _HT_CAPABILITY_IE_, &ie_len, (pmlmeinfo->network.IELength - sizeof(struct ndis_802_11_fixed_ies)));
if (p && (!is_ap_in_tkip(padapter))) {
memcpy(&(pmlmeinfo->HT_caps), (p + 2), sizeof(struct HT_caps_element));
@ -6840,9 +6840,9 @@ void issue_assocreq(struct adapter *padapter)
}
/* vendor specific IE, such as WPA, WMM, WPS */
for (i = sizeof(NDIS_802_11_FIXED_IEs); i < pmlmeinfo->network.IELength;)
for (i = sizeof(struct ndis_802_11_fixed_ies); i < pmlmeinfo->network.IELength;)
{
pIE = (PNDIS_802_11_VARIABLE_IEs)(pmlmeinfo->network.IEs + i);
pIE = (struct ndis_802_11_variable_ies *)(pmlmeinfo->network.IEs + i);
switch (pIE->ElementID)
{
@ -8565,8 +8565,8 @@ void start_clnt_join(struct adapter* padapter)
rtw_warn_on(1);
return;
}
if (_rtw_memcmp(&(scanned->network.Ssid), &(pnetwork->Ssid), sizeof(NDIS_802_11_SSID)) == true
&& _rtw_memcmp(scanned->network.MacAddress, pnetwork->MacAddress, sizeof(NDIS_802_11_MAC_ADDRESS)) == true
if (_rtw_memcmp(&(scanned->network.Ssid), &(pnetwork->Ssid), sizeof(struct ndis_802_11_ssid)) == true
&& _rtw_memcmp(scanned->network.MacAddress, pnetwork->MacAddress, sizeof(ETH_ALEN)) == true
) {
ie_offset = (scanned->network.Reserved[0] == 2? 0:12);
if (rtw_get_p2p_ie(scanned->network.IEs+ie_offset, scanned->network.IELength-ie_offset, NULL, NULL))
@ -9882,7 +9882,7 @@ u8 createbss_hdl(struct adapter *padapter, u8 *pbuf)
u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf)
{
u8 join_type;
PNDIS_802_11_VARIABLE_IEs pIE;
struct ndis_802_11_variable_ies * pIE;
struct registry_priv *pregpriv = &padapter->registrypriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -9943,9 +9943,9 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf)
/* 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_ies); i < pnetwork->IELength;)
{
pIE = (PNDIS_802_11_VARIABLE_IEs)(pnetwork->IEs + i);
pIE = (struct ndis_802_11_variable_ies *)(pnetwork->IEs + i);
switch (pIE->ElementID)
{

4
core/rtw_p2p.c
View file

@ -3135,12 +3135,12 @@ static void find_phase_handler( struct 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;
u8 _status = 0;
memset((unsigned char*)&ssid, 0, sizeof(NDIS_802_11_SSID));
memset((unsigned char*)&ssid, 0, sizeof(struct ndis_802_11_ssid));
memcpy(ssid.Ssid, pwdinfo->p2p_wildcard_ssid, P2P_WILDCARD_SSID_LEN );
ssid.SsidLength = P2P_WILDCARD_SSID_LEN;

2
core/rtw_sta_mgt.c
View file

@ -623,7 +623,7 @@ u32 rtw_init_bcmc_stainfo(struct adapter* padapter)
struct sta_info *psta;
struct tx_servq *ptxservq;
u32 res=_SUCCESS;
NDIS_802_11_MAC_ADDRESS bcast_addr= {0xff,0xff,0xff,0xff,0xff,0xff};
u8 bcast_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff};
struct sta_priv *pstapriv = &padapter->stapriv;
/* _queue *pstapending = &padapter->xmitpriv.bm_pending; */

52
core/rtw_wlan_util.c
View file

@ -701,7 +701,7 @@ void flush_all_cam_entry(struct adapter *padapter)
}
#if defined(CONFIG_P2P) && defined(CONFIG_P2P)
int WFD_info_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
int WFD_info_handler(struct adapter *padapter, struct ndis_802_11_variable_ies * pIE)
{
struct registry_priv *pregpriv = &padapter->registrypriv;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -736,7 +736,7 @@ int WFD_info_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
}
#endif
int WMM_param_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
int WMM_param_handler(struct adapter *padapter, struct ndis_802_11_variable_ies * pIE)
{
/* struct registry_priv *pregpriv = &padapter->registrypriv; */
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -875,7 +875,7 @@ void WMMOnAssocRsp(struct adapter *padapter)
return;
}
static void bwmode_update_check(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
static void bwmode_update_check(struct adapter *padapter, struct ndis_802_11_variable_ies * pIE)
{
unsigned char new_bwmode;
unsigned char new_ch_offset;
@ -970,7 +970,7 @@ static void bwmode_update_check(struct adapter *padapter, PNDIS_802_11_VARIABLE_
}
}
void HT_caps_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
void HT_caps_handler(struct adapter *padapter, struct ndis_802_11_variable_ies * pIE)
{
unsigned int i;
u8 rf_type;
@ -1037,7 +1037,7 @@ void HT_caps_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
}
}
void HT_info_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
void HT_info_handler(struct adapter *padapter, struct ndis_802_11_variable_ies * pIE)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -1091,7 +1091,7 @@ void HTOnAssocRsp(struct adapter *padapter)
rtw_hal_set_hwreg(padapter, HW_VAR_AMPDU_FACTOR, (u8 *)(&max_AMPDU_len));
}
void ERP_IE_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
void ERP_IE_handler(struct adapter *padapter, struct ndis_802_11_variable_ies * pIE)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -1368,13 +1368,13 @@ void update_beacon_info(struct adapter *padapter, u8 *pframe, uint pkt_len, stru
{
unsigned int i;
unsigned int len;
PNDIS_802_11_VARIABLE_IEs pIE;
struct ndis_802_11_variable_ies * 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_variable_ies *)(pframe + (_BEACON_IE_OFFSET_ + WLAN_HDR_A3_LEN) + i);
switch (pIE->ElementID) {
case _HT_EXTRA_INFO_IE_: /* HT info */
@ -1399,14 +1399,14 @@ void process_csa_ie(struct adapter *padapter, u8 *pframe, uint pkt_len)
{
unsigned int i;
unsigned int len;
PNDIS_802_11_VARIABLE_IEs pIE;
struct ndis_802_11_variable_ies * pIE;
u8 new_ch_no = 0;
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_variable_ies *)(pframe + (_BEACON_IE_OFFSET_ + WLAN_HDR_A3_LEN) + i);
switch (pIE->ElementID)
{
@ -1427,16 +1427,16 @@ void process_csa_ie(struct adapter *padapter, u8 *pframe, uint pkt_len)
unsigned int is_ap_in_tkip(struct adapter *padapter)
{
u32 i;
PNDIS_802_11_VARIABLE_IEs pIE;
struct ndis_802_11_variable_ies * pIE;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network);
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_ies); i < pmlmeinfo->network.IELength;)
{
pIE = (PNDIS_802_11_VARIABLE_IEs)(pmlmeinfo->network.IEs + i);
pIE = (struct ndis_802_11_variable_ies *)(pmlmeinfo->network.IEs + i);
switch (pIE->ElementID)
{
@ -1472,15 +1472,15 @@ unsigned int is_ap_in_tkip(struct adapter *padapter)
unsigned int should_forbid_n_rate(struct adapter * padapter)
{
u32 i;
PNDIS_802_11_VARIABLE_IEs pIE;
struct ndis_802_11_variable_ies * pIE;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wlan_bssid_ex *cur_network = &pmlmepriv->cur_network.network;
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_ies); i < cur_network->IELength;)
{
pIE = (PNDIS_802_11_VARIABLE_IEs)(cur_network->IEs + i);
pIE = (struct ndis_802_11_variable_ies *)(cur_network->IEs + i);
switch (pIE->ElementID)
{
@ -1508,16 +1508,16 @@ unsigned int should_forbid_n_rate(struct adapter * padapter)
unsigned int is_ap_in_wep(struct adapter *padapter)
{
u32 i;
PNDIS_802_11_VARIABLE_IEs pIE;
struct ndis_802_11_variable_ies * pIE;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network);
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_ies); i < pmlmeinfo->network.IELength;)
{
pIE = (PNDIS_802_11_VARIABLE_IEs)(pmlmeinfo->network.IEs + i);
pIE = (struct ndis_802_11_variable_ies *)(pmlmeinfo->network.IEs + i);
switch (pIE->ElementID)
{
@ -1720,7 +1720,7 @@ void set_sta_rate(struct adapter *padapter, struct sta_info *psta)
/* Update RRSR and Rate for USERATE */
void update_tx_basic_rate(struct adapter *padapter, u8 wirelessmode)
{
NDIS_802_11_RATES_EX supported_rates;
u8 supported_rates[NDIS_802_11_LENGTH_RATES_EX];
#ifdef CONFIG_P2P
struct wifidirect_info* pwdinfo = &padapter->wdinfo;
@ -1751,15 +1751,15 @@ void update_tx_basic_rate(struct 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_variable_ies * 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_ies); i < len;)
{
pIE = (PNDIS_802_11_VARIABLE_IEs)(pframe + i);
pIE = (struct ndis_802_11_variable_ies *)(pframe + i);
switch (pIE->ElementID)
{
@ -2018,12 +2018,12 @@ void update_bmc_sta_support_rate(struct adapter *padapter, u32 mac_id)
int update_sta_support_rate(struct 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_variable_ies * 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_variable_ies *)rtw_get_ie(pvar_ie, _SUPPORTEDRATES_IE_, &ie_len, var_ie_len);
if (pIE == NULL)
{
return _FAIL;
@ -2032,7 +2032,7 @@ int update_sta_support_rate(struct adapter *padapter, u8* pvar_ie, uint var_ie_l
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_variable_ies *)rtw_get_ie(pvar_ie, _EXT_SUPPORTEDRATES_IE_, &ie_len, var_ie_len);
if (pIE)
{
memcpy((pmlmeinfo->FW_sta_info[cam_idx].SupportedRates + supportRateNum), pIE->data, ie_len);