mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-06-23 08:34:20 +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
|
@ -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:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue