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

rtl8188eu: Convert the typedef statements in include/wlan_bssdef.h

Browse source 
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 2013-07-23 21:31:04 -05:00
parent 3c0fdf5c36
commit a01908ab27
29 changed files with 411 additions and 495 deletions
Download patch file Download diff file Expand all files Collapse all files

42
core/rtw_ap.c
View file

@ -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;