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

rtl8188eu: Convert typedef for _adapter, etc.

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-26 20:08:39 -05:00
parent e8012b9521
commit 2bd2f4b4c8
99 changed files with 2239 additions and 2251 deletions
Download patch file Download diff file Expand all files Collapse all files

74
core/rtw_ap.c
View file

@ -32,7 +32,7 @@ extern unsigned char WPS_OUI[];
extern unsigned char P2P_OUI[];
extern unsigned char WFD_OUI[];
void init_mlme_ap_info(_adapter *padapter)
void init_mlme_ap_info(struct adapter *padapter)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -48,7 +48,7 @@ void init_mlme_ap_info(_adapter *padapter)
start_ap_mode(padapter);
}
void free_mlme_ap_info(_adapter *padapter)
void free_mlme_ap_info(struct adapter *padapter)
{
unsigned long irqL;
struct sta_info *psta=NULL;
@ -76,7 +76,7 @@ void free_mlme_ap_info(_adapter *padapter)
_rtw_spinlock_free(&pmlmepriv->bcn_update_lock);
}
static void update_BCNTIM(_adapter *padapter)
static void update_BCNTIM(struct adapter *padapter)
{
struct sta_priv *pstapriv = &padapter->stapriv;
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@ -165,7 +165,7 @@ static void update_BCNTIM(_adapter *padapter)
set_tx_beacon_cmd(padapter);
}
void rtw_add_bcn_ie(_adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index, u8 *data, u8 len)
void rtw_add_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index, u8 *data, u8 len)
{
struct ndis_802_11_var_ie * pIE;
u8 bmatch = false;
@ -227,7 +227,7 @@ void rtw_add_bcn_ie(_adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index
pnetwork->IELength = offset + remainder_ielen;
}
void rtw_remove_bcn_ie(_adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index)
void rtw_remove_bcn_ie(struct 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;
@ -278,7 +278,7 @@ static u8 chk_sta_is_alive(struct sta_info *psta)
return ret;
}
void expire_timeout_chk(_adapter *padapter)
void expire_timeout_chk(struct adapter *padapter)
{
unsigned long irqL;
struct list_head *phead, *plist;
@ -444,7 +444,7 @@ void expire_timeout_chk(_adapter *padapter)
associated_clients_update(padapter, updated);
}
void add_RATid(_adapter *padapter, struct sta_info *psta, u8 rssi_level)
void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level)
{
int i;
u8 rf_type;
@ -543,7 +543,7 @@ void add_RATid(_adapter *padapter, struct sta_info *psta, u8 rssi_level)
}
}
static void update_bmc_sta(_adapter *padapter)
static void update_bmc_sta(struct adapter *padapter)
{
unsigned long irqL;
u32 init_rate=0;
@ -632,7 +632,7 @@ static void update_bmc_sta(_adapter *padapter)
/* MAC_ID = 0 for bssid for sta/ap/adhoc */
/* CAM_ID = 0~3 for default key, cmd_id=macid + 3, macid=aid+1; */
void update_sta_info_apmode(_adapter *padapter, struct sta_info *psta)
void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)
{
unsigned long irqL;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -699,7 +699,7 @@ void update_sta_info_apmode(_adapter *padapter, struct sta_info *psta)
_exit_critical_bh(&psta->lock, &irqL);
}
static void update_hw_ht_param(_adapter *padapter)
static void update_hw_ht_param(struct adapter *padapter)
{
unsigned char max_AMPDU_len;
unsigned char min_MPDU_spacing;
@ -730,7 +730,7 @@ static void update_hw_ht_param(_adapter *padapter)
DBG_88E("%s(): WLAN_HT_CAP_SM_PS_STATIC\n",__func__);
}
static void start_bss_network(_adapter *padapter, u8 *pbuf)
static void start_bss_network(struct adapter *padapter, u8 *pbuf)
{
u8 *p;
u8 val8, cur_channel, cur_bwmode, cur_ch_offset;
@ -873,7 +873,7 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf)
update_bmc_sta(padapter);
}
int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf, int len)
int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
{
int ret=_SUCCESS;
u8 *p;
@ -1193,7 +1193,7 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf, int len)
}
void rtw_set_macaddr_acl(_adapter *padapter, int mode)
void rtw_set_macaddr_acl(struct adapter *padapter, int mode)
{
struct sta_priv *pstapriv = &padapter->stapriv;
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
@ -1203,7 +1203,7 @@ void rtw_set_macaddr_acl(_adapter *padapter, int mode)
pacl_list->mode = mode;
}
int rtw_acl_add_sta(_adapter *padapter, u8 *addr)
int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)
{
unsigned long irqL;
struct list_head *plist, *phead;
@ -1277,7 +1277,7 @@ int rtw_acl_add_sta(_adapter *padapter, u8 *addr)
return ret;
}
int rtw_acl_remove_sta(_adapter *padapter, u8 *addr)
int rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)
{
unsigned long irqL;
struct list_head *plist, *phead;
@ -1320,13 +1320,13 @@ int rtw_acl_remove_sta(_adapter *padapter, u8 *addr)
}
static void update_bcn_fixed_ie(_adapter *padapter)
static void update_bcn_fixed_ie(struct adapter *padapter)
{
DBG_88E("%s\n", __func__);
}
static void update_bcn_erpinfo_ie(_adapter *padapter)
static void update_bcn_erpinfo_ie(struct adapter *padapter)
{
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@ -1361,37 +1361,37 @@ static void update_bcn_erpinfo_ie(_adapter *padapter)
}
static void update_bcn_htcap_ie(_adapter *padapter)
static void update_bcn_htcap_ie(struct adapter *padapter)
{
DBG_88E("%s\n", __func__);
}
static void update_bcn_htinfo_ie(_adapter *padapter)
static void update_bcn_htinfo_ie(struct adapter *padapter)
{
DBG_88E("%s\n", __func__);
}
static void update_bcn_rsn_ie(_adapter *padapter)
static void update_bcn_rsn_ie(struct adapter *padapter)
{
DBG_88E("%s\n", __func__);
}
static void update_bcn_wpa_ie(_adapter *padapter)
static void update_bcn_wpa_ie(struct adapter *padapter)
{
DBG_88E("%s\n", __func__);
}
static void update_bcn_wmm_ie(_adapter *padapter)
static void update_bcn_wmm_ie(struct adapter *padapter)
{
DBG_88E("%s\n", __func__);
}
static void update_bcn_wps_ie(_adapter *padapter)
static void update_bcn_wps_ie(struct adapter *padapter)
{
u8 *pwps_ie=NULL, *pwps_ie_src, *premainder_ie, *pbackup_remainder_ie=NULL;
uint wps_ielen=0, wps_offset, remainder_ielen;
@ -1447,12 +1447,12 @@ static void update_bcn_wps_ie(_adapter *padapter)
}
static void update_bcn_p2p_ie(_adapter *padapter)
static void update_bcn_p2p_ie(struct adapter *padapter)
{
}
static void update_bcn_vendor_spec_ie(_adapter *padapter, u8*oui)
static void update_bcn_vendor_spec_ie(struct adapter *padapter, u8*oui)
{
DBG_88E("%s\n", __func__);
@ -1480,7 +1480,7 @@ static void update_bcn_vendor_spec_ie(_adapter *padapter, u8*oui)
}
void update_beacon(_adapter *padapter, u8 ie_id, u8 *oui, u8 tx)
void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx)
{
unsigned long irqL;
struct mlme_priv *pmlmepriv;
@ -1567,7 +1567,7 @@ Set to 2 if only HT STAs are associated in BSS,
Set to 3 (HT mixed mode) when one or more non-HT STAs are associated
(currently non-GF HT station is considered as non-HT STA also)
*/
static int rtw_ht_operation_update(_adapter *padapter)
static int rtw_ht_operation_update(struct adapter *padapter)
{
u16 cur_op_mode, new_op_mode;
int op_mode_changes = 0;
@ -1638,7 +1638,7 @@ static int rtw_ht_operation_update(_adapter *padapter)
#endif /* CONFIG_80211N_HT */
void associated_clients_update(_adapter *padapter, u8 updated)
void associated_clients_update(struct adapter *padapter, u8 updated)
{
/* update associcated stations cap. */
if (updated == true)
@ -1670,7 +1670,7 @@ void associated_clients_update(_adapter *padapter, u8 updated)
}
/* called > TSR LEVEL for USB or SDIO Interface*/
void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)
{
u8 beacon_updated = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -1843,7 +1843,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
}
u8 bss_cap_update_on_sta_leave(_adapter *padapter, struct sta_info *psta)
u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta)
{
u8 beacon_updated = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -1917,7 +1917,7 @@ u8 bss_cap_update_on_sta_leave(_adapter *padapter, struct sta_info *psta)
}
u8 ap_free_sta(_adapter *padapter, struct sta_info *psta, bool active, u16 reason)
u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta, bool active, u16 reason)
{
unsigned long irqL;
u8 beacon_updated = false;
@ -1962,7 +1962,7 @@ u8 ap_free_sta(_adapter *padapter, struct sta_info *psta, bool active, u16 reaso
return beacon_updated;
}
int rtw_ap_inform_ch_switch (_adapter *padapter, u8 new_ch, u8 ch_offset)
int rtw_ap_inform_ch_switch (struct adapter *padapter, u8 new_ch, u8 ch_offset)
{
unsigned long irqL;
struct list_head *phead, *plist;
@ -1999,7 +1999,7 @@ int rtw_ap_inform_ch_switch (_adapter *padapter, u8 new_ch, u8 ch_offset)
return ret;
}
int rtw_sta_flush(_adapter *padapter)
int rtw_sta_flush(struct adapter *padapter)
{
unsigned long irqL;
struct list_head *phead, *plist;
@ -2044,7 +2044,7 @@ int rtw_sta_flush(_adapter *padapter)
}
/* called > TSR LEVEL for USB or SDIO Interface*/
void sta_info_update(_adapter *padapter, struct sta_info *psta)
void sta_info_update(struct adapter *padapter, struct sta_info *psta)
{
int flags = psta->flags;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -2083,7 +2083,7 @@ void sta_info_update(_adapter *padapter, struct sta_info *psta)
}
/* called >= TSR LEVEL for USB or SDIO Interface*/
void ap_sta_info_defer_update(_adapter *padapter, struct sta_info *psta)
void ap_sta_info_defer_update(struct adapter *padapter, struct sta_info *psta)
{
if (psta->state & _FW_LINKED)
{
@ -2092,7 +2092,7 @@ void ap_sta_info_defer_update(_adapter *padapter, struct sta_info *psta)
}
}
void start_ap_mode(_adapter *padapter)
void start_ap_mode(struct adapter *padapter)
{
int i;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -2147,7 +2147,7 @@ void start_ap_mode(_adapter *padapter)
}
void stop_ap_mode(_adapter *padapter)
void stop_ap_mode(struct adapter *padapter)
{
unsigned long irqL;
struct list_head *phead, *plist;

24
core/rtw_br_ext.c
View file

@ -128,7 +128,7 @@ static int skb_pull_and_merge(struct sk_buff *skb, unsigned char *src, int len)
return 0;
}
static __inline__ unsigned long __nat25_timeout(_adapter *priv)
static __inline__ unsigned long __nat25_timeout(struct adapter *priv)
{
unsigned long timeout;
@ -138,7 +138,7 @@ static __inline__ unsigned long __nat25_timeout(_adapter *priv)
}
static __inline__ int __nat25_has_expired(_adapter *priv,
static __inline__ int __nat25_has_expired(struct adapter *priv,
struct nat25_network_db_entry *fdb)
{
if (time_before_eq(fdb->ageing_timer, __nat25_timeout(priv)))
@ -355,7 +355,7 @@ static __inline__ int __nat25_network_hash(unsigned char *networkAddr)
}
}
static __inline__ void __network_hash_link(_adapter *priv,
static __inline__ void __network_hash_link(struct adapter *priv,
struct nat25_network_db_entry *ent, int hash)
{
/* Caller must _enter_critical_bh already! */
@ -388,7 +388,7 @@ static __inline__ void __network_hash_unlink(struct nat25_network_db_entry *ent)
}
static int __nat25_db_network_lookup_and_replace(_adapter *priv,
static int __nat25_db_network_lookup_and_replace(struct adapter *priv,
struct sk_buff *skb, unsigned char *networkAddr)
{
struct nat25_network_db_entry *db;
@ -443,7 +443,7 @@ static int __nat25_db_network_lookup_and_replace(_adapter *priv,
return 0;
}
static void __nat25_db_network_insert(_adapter *priv,
static void __nat25_db_network_insert(struct adapter *priv,
unsigned char *macAddr, unsigned char *networkAddr)
{
struct nat25_network_db_entry *db;
@ -483,7 +483,7 @@ static void __nat25_db_network_insert(_adapter *priv,
}
static void __nat25_db_print(_adapter *priv)
static void __nat25_db_print(struct adapter *priv)
{
}
@ -491,7 +491,7 @@ static void __nat25_db_print(_adapter *priv)
* NAT2.5 interface
*/
void nat25_db_cleanup(_adapter *priv)
void nat25_db_cleanup(struct adapter *priv)
{
int i;
unsigned long irqL;
@ -522,7 +522,7 @@ void nat25_db_cleanup(_adapter *priv)
}
void nat25_db_expire(_adapter *priv)
void nat25_db_expire(struct adapter *priv)
{
int i;
unsigned long irqL;
@ -559,7 +559,7 @@ void nat25_db_expire(_adapter *priv)
_exit_critical_bh(&priv->br_ext_lock, &irqL);
}
int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method)
int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
{
unsigned short protocol;
unsigned char networkAddr[MAX_NETWORK_ADDR_LEN];
@ -1247,7 +1247,7 @@ int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method)
return -1;
}
int nat25_handle_frame(_adapter *priv, struct sk_buff *skb)
int nat25_handle_frame(struct adapter *priv, struct sk_buff *skb)
{
if (!(skb->data[0] & 1)) {
int is_vlan_tag=0, i, retval=0;
@ -1334,7 +1334,7 @@ struct dhcpMessage {
u_int8_t options[308]; /* 312 - cookie */
};
void dhcp_flag_bcast(_adapter *priv, struct sk_buff *skb)
void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb)
{
if (skb == NULL)
return;
@ -1380,7 +1380,7 @@ void dhcp_flag_bcast(_adapter *priv, struct sk_buff *skb)
}
void *scdb_findEntry(_adapter *priv, unsigned char *macAddr,
void *scdb_findEntry(struct adapter *priv, unsigned char *macAddr,
unsigned char *ipAddr)
{
unsigned char networkAddr[MAX_NETWORK_ADDR_LEN];

118
core/rtw_cmd.c
View file

@ -264,7 +264,7 @@ int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
{
int res = _FAIL;
PADAPTER padapter = pcmdpriv->padapter;
struct adapter * padapter = pcmdpriv->padapter;
_func_enter_;
@ -341,9 +341,9 @@ int rtw_cmd_thread(void *context)
u8 ret;
struct cmd_obj *pcmd;
u8 *pcmdbuf;
u8 (*cmd_hdl)(_adapter *padapter, u8* pbuf);
void (*pcmd_callback)(_adapter *dev, struct cmd_obj *pcmd);
PADAPTER padapter = (PADAPTER)context;
u8 (*cmd_hdl)(struct adapter *padapter, u8* pbuf);
void (*pcmd_callback)(struct adapter *dev, struct cmd_obj *pcmd);
struct adapter * padapter = (struct adapter *)context;
struct cmd_priv *pcmdpriv = &(padapter->cmdpriv);
_func_enter_;
@ -460,7 +460,7 @@ _func_exit_;
}
u8 rtw_setstandby_cmd(_adapter *padapter, uint action)
u8 rtw_setstandby_cmd(struct adapter *padapter, uint action)
{
struct cmd_obj* ph2c;
struct usb_suspend_parm* psetusbsuspend;
@ -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, struct 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;
@ -592,7 +592,7 @@ _func_exit_;
return res;
}
u8 rtw_setdatarate_cmd(_adapter *padapter, u8 *rateset)
u8 rtw_setdatarate_cmd(struct adapter *padapter, u8 *rateset)
{
struct cmd_obj* ph2c;
struct setdatarate_parm* pbsetdataratepara;
@ -625,7 +625,7 @@ _func_exit_;
return res;
}
u8 rtw_setbasicrate_cmd(_adapter *padapter, u8 *rateset)
u8 rtw_setbasicrate_cmd(struct adapter *padapter, u8 *rateset)
{
struct cmd_obj* ph2c;
struct setbasicrate_parm* pssetbasicratepara;
@ -667,7 +667,7 @@ unsigned char rtw_setphy_cmd(unsigned char *adapter)
2. for AdHoc/Ap mode or mp mode?
*/
u8 rtw_setphy_cmd(_adapter *padapter, u8 modem, u8 ch)
u8 rtw_setphy_cmd(struct adapter *padapter, u8 modem, u8 ch)
{
struct cmd_obj* ph2c;
struct setphy_parm* psetphypara;
@ -704,7 +704,7 @@ _func_exit_;
return res;
}
u8 rtw_setbbreg_cmd(_adapter*padapter, u8 offset, u8 val)
u8 rtw_setbbreg_cmd(struct adapter*padapter, u8 offset, u8 val)
{
struct cmd_obj* ph2c;
struct writeBB_parm* pwritebbparm;
@ -735,7 +735,7 @@ _func_exit_;
return res;
}
u8 rtw_getbbreg_cmd(_adapter *padapter, u8 offset, u8 *pval)
u8 rtw_getbbreg_cmd(struct adapter *padapter, u8 offset, u8 *pval)
{
struct cmd_obj* ph2c;
struct readBB_parm* prdbbparm;
@ -770,7 +770,7 @@ _func_exit_;
return res;
}
u8 rtw_setrfreg_cmd(_adapter *padapter, u8 offset, u32 val)
u8 rtw_setrfreg_cmd(struct adapter *padapter, u8 offset, u32 val)
{
struct cmd_obj* ph2c;
struct writeRF_parm* pwriterfparm;
@ -801,7 +801,7 @@ _func_exit_;
return res;
}
u8 rtw_getrfreg_cmd(_adapter *padapter, u8 offset, u8 *pval)
u8 rtw_getrfreg_cmd(struct adapter *padapter, u8 offset, u8 *pval)
{
struct cmd_obj* ph2c;
struct readRF_parm* prdrfparm;
@ -841,7 +841,7 @@ _func_exit_;
return res;
}
void rtw_getbbrfreg_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd)
void rtw_getbbrfreg_cmdrsp_callback(struct adapter* padapter, struct cmd_obj *pcmd)
{
_func_enter_;
@ -853,7 +853,7 @@ void rtw_getbbrfreg_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd)
_func_exit_;
}
void rtw_readtssi_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd)
void rtw_readtssi_cmdrsp_callback(struct adapter* padapter, struct cmd_obj *pcmd)
{
_func_enter_;
@ -865,7 +865,7 @@ void rtw_readtssi_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd)
_func_exit_;
}
u8 rtw_createbss_cmd(_adapter *padapter)
u8 rtw_createbss_cmd(struct adapter *padapter)
{
struct cmd_obj* pcmd;
struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
@ -904,7 +904,7 @@ _func_exit_;
return res;
}
u8 rtw_createbss_cmd_ex(_adapter *padapter, unsigned char *pbss, unsigned int sz)
u8 rtw_createbss_cmd_ex(struct adapter *padapter, unsigned char *pbss, unsigned int sz)
{
struct cmd_obj* pcmd;
struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
@ -934,7 +934,7 @@ _func_exit_;
return res;
}
u8 rtw_joinbss_cmd(_adapter *padapter, struct wlan_network* pnetwork)
u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network* pnetwork)
{
u8 res = _SUCCESS;
uint t_len = 0;
@ -1096,7 +1096,7 @@ _func_exit_;
return res;
}
u8 rtw_disassoc_cmd(_adapter*padapter, u32 deauth_timeout_ms, bool enqueue) /* for sta_mode */
u8 rtw_disassoc_cmd(struct adapter*padapter, u32 deauth_timeout_ms, bool enqueue) /* for sta_mode */
{
struct cmd_obj *cmdobj = NULL;
struct disconnect_parm *param = NULL;
@ -1139,7 +1139,7 @@ _func_exit_;
return res;
}
u8 rtw_setopmode_cmd(_adapter *padapter, enum ndis_802_11_network_infra networktype)
u8 rtw_setopmode_cmd(struct adapter *padapter, enum ndis_802_11_network_infra networktype)
{
struct cmd_obj* ph2c;
struct setopmode_parm* psetop;
@ -1174,7 +1174,7 @@ _func_exit_;
return res;
}
u8 rtw_setstakey_cmd(_adapter *padapter, u8 *psta, u8 unicast_key)
u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key)
{
struct cmd_obj* ph2c;
struct set_stakey_parm *psetstakey_para;
@ -1239,7 +1239,7 @@ _func_exit_;
return res;
}
u8 rtw_clearstakey_cmd(_adapter *padapter, u8 *psta, u8 entry, u8 enqueue)
u8 rtw_clearstakey_cmd(struct adapter *padapter, u8 *psta, u8 entry, u8 enqueue)
{
struct cmd_obj* ph2c;
struct set_stakey_parm *psetstakey_para;
@ -1300,7 +1300,7 @@ _func_exit_;
return res;
}
u8 rtw_setrttbl_cmd(_adapter *padapter, struct setratable_parm *prate_table)
u8 rtw_setrttbl_cmd(struct adapter *padapter, struct setratable_parm *prate_table)
{
struct cmd_obj* ph2c;
struct setratable_parm * psetrttblparm;
@ -1332,7 +1332,7 @@ _func_exit_;
}
u8 rtw_getrttbl_cmd(_adapter *padapter, struct getratable_rsp *pval)
u8 rtw_getrttbl_cmd(struct adapter *padapter, struct getratable_rsp *pval)
{
struct cmd_obj* ph2c;
struct getratable_parm * pgetrttblparm;
@ -1371,7 +1371,7 @@ _func_exit_;
}
u8 rtw_setassocsta_cmd(_adapter *padapter, u8 *mac_addr)
u8 rtw_setassocsta_cmd(struct adapter *padapter, u8 *mac_addr)
{
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
struct cmd_obj* ph2c;
@ -1417,7 +1417,7 @@ _func_exit_;
return res;
}
u8 rtw_addbareq_cmd(_adapter*padapter, u8 tid, u8 *addr)
u8 rtw_addbareq_cmd(struct adapter*padapter, u8 tid, u8 *addr)
{
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
struct cmd_obj* ph2c;
@ -1457,7 +1457,7 @@ _func_exit_;
return res;
}
u8 rtw_dynamic_chk_wk_cmd(_adapter*padapter)
u8 rtw_dynamic_chk_wk_cmd(struct adapter*padapter)
{
struct cmd_obj* ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -1497,7 +1497,7 @@ _func_exit_;
}
u8 rtw_set_ch_cmd(_adapter*padapter, u8 ch, u8 bw, u8 ch_offset, u8 enqueue)
u8 rtw_set_ch_cmd(struct adapter*padapter, u8 ch, u8 bw, u8 ch_offset, u8 enqueue)
{
struct cmd_obj *pcmdobj;
struct set_ch_parm *set_ch_parm;
@ -1552,7 +1552,7 @@ _func_exit_;
return res;
}
u8 rtw_set_chplan_cmd(_adapter*padapter, u8 chplan, u8 enqueue)
u8 rtw_set_chplan_cmd(struct adapter*padapter, u8 chplan, u8 enqueue)
{
struct cmd_obj* pcmdobj;
struct SetChannelPlan_param *setChannelPlan_param;
@ -1611,7 +1611,7 @@ _func_exit_;
return res;
}
u8 rtw_led_blink_cmd(_adapter*padapter, struct LED_871x * pLed)
u8 rtw_led_blink_cmd(struct adapter*padapter, struct LED_871x * pLed)
{
struct cmd_obj* pcmdobj;
struct LedBlink_param *ledBlink_param;
@ -1648,7 +1648,7 @@ _func_exit_;
return res;
}
u8 rtw_set_csa_cmd(_adapter*padapter, u8 new_ch_no)
u8 rtw_set_csa_cmd(struct adapter*padapter, u8 new_ch_no)
{
struct cmd_obj* pcmdobj;
struct SetChannelSwitch_param*setChannelSwitch_param;
@ -1686,12 +1686,12 @@ _func_exit_;
return res;
}
u8 rtw_tdls_cmd(_adapter *padapter, u8 *addr, u8 option)
u8 rtw_tdls_cmd(struct adapter *padapter, u8 *addr, u8 option)
{
return _SUCCESS;
}
static void traffic_status_watchdog(_adapter *padapter)
static void traffic_status_watchdog(struct adapter *padapter)
{
u8 bEnterPS;
u8 bBusyTraffic = false, bTxBusyTraffic = false, bRxBusyTraffic = false;
@ -1776,12 +1776,12 @@ static void traffic_status_watchdog(_adapter *padapter)
pmlmepriv->LinkDetectInfo.bHigherBusyTxTraffic = bHigherBusyTxTraffic;
}
void dynamic_chk_wk_hdl(_adapter *padapter, u8 *pbuf, int sz);
void dynamic_chk_wk_hdl(_adapter *padapter, u8 *pbuf, int sz)
void dynamic_chk_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz);
void dynamic_chk_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz)
{
struct mlme_priv *pmlmepriv;
padapter = (_adapter *)pbuf;
padapter = (struct adapter *)pbuf;
pmlmepriv = &(padapter->mlmepriv);
#ifdef CONFIG_AP_MODE
@ -1802,7 +1802,7 @@ void dynamic_chk_wk_hdl(_adapter *padapter, u8 *pbuf, int sz)
#endif
}
void lps_ctrl_wk_hdl(_adapter *padapter, u8 lps_ctrl_type)
void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
{
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -1886,7 +1886,7 @@ _func_enter_;
_func_exit_;
}
u8 rtw_lps_ctrl_wk_cmd(_adapter*padapter, u8 lps_ctrl_type, u8 enqueue)
u8 rtw_lps_ctrl_wk_cmd(struct adapter*padapter, u8 lps_ctrl_type, u8 enqueue)
{
struct cmd_obj *ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -1936,12 +1936,12 @@ _func_exit_;
}
#if (RATE_ADAPTIVE_SUPPORT==1)
static void rpt_timer_setting_wk_hdl(_adapter *padapter, u16 minRptTime)
static void rpt_timer_setting_wk_hdl(struct adapter *padapter, u16 minRptTime)
{
rtw_hal_set_hwreg(padapter, HW_VAR_RPT_TIMER_SETTING, (u8 *)(&minRptTime));
}
u8 rtw_rpt_timer_cfg_cmd(_adapter*padapter, u16 minRptTime)
u8 rtw_rpt_timer_cfg_cmd(struct adapter*padapter, u16 minRptTime)
{
struct cmd_obj *ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -1978,12 +1978,12 @@ _func_exit_;
#endif
static void antenna_select_wk_hdl(_adapter *padapter, u8 antenna)
static void antenna_select_wk_hdl(struct adapter *padapter, u8 antenna)
{
rtw_hal_set_hwreg(padapter, HW_VAR_ANTENNA_DIVERSITY_SELECT, (u8 *)(&antenna));
}
u8 rtw_antenna_select_cmd(_adapter*padapter, u8 antenna,u8 enqueue)
u8 rtw_antenna_select_cmd(struct adapter*padapter, u8 antenna,u8 enqueue)
{
struct cmd_obj *ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -2028,13 +2028,13 @@ _func_exit_;
}
void power_saving_wk_hdl(_adapter *padapter, u8 *pbuf, int sz)
void power_saving_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz)
{
rtw_ps_processor(padapter);
}
#ifdef CONFIG_P2P
u8 p2p_protocol_wk_cmd(_adapter*padapter, int intCmdType )
u8 p2p_protocol_wk_cmd(struct adapter*padapter, int intCmdType )
{
struct cmd_obj *ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -2079,7 +2079,7 @@ _func_exit_;
}
#endif /* CONFIG_P2P */
u8 rtw_ps_cmd(_adapter*padapter)
u8 rtw_ps_cmd(struct adapter*padapter)
{
struct cmd_obj *ppscmd;
struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -2117,7 +2117,7 @@ _func_exit_;
#ifdef CONFIG_AP_MODE
static void rtw_chk_hi_queue_hdl(_adapter *padapter)
static void rtw_chk_hi_queue_hdl(struct adapter *padapter)
{
int cnt=0;
struct sta_info *psta_bmc;
@ -2164,7 +2164,7 @@ static void rtw_chk_hi_queue_hdl(_adapter *padapter)
}
u8 rtw_chk_hi_queue_cmd(_adapter*padapter)
u8 rtw_chk_hi_queue_cmd(struct adapter*padapter)
{
struct cmd_obj *ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -2199,7 +2199,7 @@ exit:
}
#endif
u8 rtw_c2h_wk_cmd(PADAPTER padapter, u8 *c2h_evt)
u8 rtw_c2h_wk_cmd(struct adapter * padapter, u8 *c2h_evt)
{
struct cmd_obj *ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -2232,7 +2232,7 @@ exit:
return res;
}
static s32 c2h_evt_hdl(_adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter)
static s32 c2h_evt_hdl(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter)
{
s32 ret = _FAIL;
u8 buf[16];
@ -2261,7 +2261,7 @@ exit:
static void c2h_wk_callback(struct work_struct *work)
{
struct evt_priv *evtpriv = container_of(work, struct evt_priv, c2h_wk);
_adapter *adapter = container_of(evtpriv, _adapter, evtpriv);
struct adapter *adapter = container_of(evtpriv, struct adapter, evtpriv);
struct c2h_evt_hdr *c2h_evt;
c2h_id_filter ccx_id_filter = rtw_hal_c2h_id_filter_ccx(adapter);
@ -2299,7 +2299,7 @@ static void c2h_wk_callback(struct work_struct *work)
evtpriv->c2h_wk_alive = false;
}
u8 rtw_drvextra_cmd_hdl(_adapter *padapter, unsigned char *pbuf)
u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, unsigned char *pbuf)
{
struct drvextra_cmd_parm *pdrvextra_cmd;
@ -2356,7 +2356,7 @@ u8 rtw_drvextra_cmd_hdl(_adapter *padapter, unsigned char *pbuf)
return H2C_SUCCESS;
}
void rtw_survey_cmd_callback(_adapter* padapter , struct cmd_obj *pcmd)
void rtw_survey_cmd_callback(struct adapter* padapter , struct cmd_obj *pcmd)
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -2378,7 +2378,7 @@ _func_enter_;
_func_exit_;
}
void rtw_disassoc_cmd_callback(_adapter* padapter, struct cmd_obj *pcmd)
void rtw_disassoc_cmd_callback(struct adapter* padapter, struct cmd_obj *pcmd)
{
unsigned long irqL;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -2405,7 +2405,7 @@ _func_exit_;
}
void rtw_joinbss_cmd_callback(_adapter* padapter, struct cmd_obj *pcmd)
void rtw_joinbss_cmd_callback(struct adapter* padapter, struct cmd_obj *pcmd)
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -2428,7 +2428,7 @@ _func_enter_;
_func_exit_;
}
void rtw_createbss_cmd_callback(_adapter *padapter, struct cmd_obj *pcmd)
void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
{
unsigned long irqL;
u8 timer_cancelled;
@ -2505,7 +2505,7 @@ _func_exit_;
void rtw_setstaKey_cmdrsp_callback(_adapter* padapter , struct cmd_obj *pcmd)
void rtw_setstaKey_cmdrsp_callback(struct adapter* padapter , struct cmd_obj *pcmd)
{
struct sta_priv * pstapriv = &padapter->stapriv;
@ -2524,7 +2524,7 @@ exit:
_func_exit_;
}
void rtw_setassocsta_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd)
void rtw_setassocsta_cmdrsp_callback(struct adapter* padapter, struct cmd_obj *pcmd)
{
unsigned long irqL;
struct sta_priv * pstapriv = &padapter->stapriv;
@ -2557,8 +2557,8 @@ exit:
_func_exit_;
}
void rtw_getrttbl_cmd_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd);
void rtw_getrttbl_cmd_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd)
void rtw_getrttbl_cmd_cmdrsp_callback(struct adapter* padapter, struct cmd_obj *pcmd);
void rtw_getrttbl_cmd_cmdrsp_callback(struct adapter* padapter, struct cmd_obj *pcmd)
{
_func_enter_;

74
core/rtw_debug.c
View file

@ -48,7 +48,7 @@ int proc_set_write_reg(struct file *file, const char __user *buffer,
unsigned long count, void *data)
{
struct net_device *dev = (struct net_device *)data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
char tmp[32];
u32 addr, val, len;
@ -97,7 +97,7 @@ int proc_get_read_reg(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
int len = 0;
@ -163,7 +163,7 @@ int proc_get_fwstate(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
int len = 0;
@ -179,7 +179,7 @@ int proc_get_sec_info(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct security_priv *psecuritypriv = &padapter->securitypriv;
int len = 0;
@ -197,7 +197,7 @@ int proc_get_mlmext_state(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -214,7 +214,7 @@ int proc_get_qos_option(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
int len = 0;
@ -231,7 +231,7 @@ int proc_get_ht_option(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
int len = 0;
@ -247,7 +247,7 @@ int proc_get_rf_info(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
int len = 0;
@ -266,7 +266,7 @@ int proc_get_ap_info(char *page, char **start,
{
struct sta_info *psta;
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct wlan_network *cur_network = &(pmlmepriv->cur_network);
@ -316,7 +316,7 @@ int proc_get_adapter_state(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
int len = 0;
len += snprintf(page + len, count - len, "bSurpriseRemoved=%d, bDriverStopped=%d\n",
@ -332,7 +332,7 @@ int proc_get_trx_info(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct recv_priv *precvpriv = &padapter->recvpriv;
int len = 0;
@ -351,7 +351,7 @@ int proc_get_mac_reg_dump1(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
int len = 0;
int i,j=1;
@ -374,7 +374,7 @@ int proc_get_mac_reg_dump2(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
int len = 0;
int i,j=1;
@ -397,7 +397,7 @@ int proc_get_mac_reg_dump3(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
int len = 0;
int i,j=1;
@ -420,7 +420,7 @@ int proc_get_bb_reg_dump1(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
int len = 0;
int i,j=1;
@ -440,7 +440,7 @@ int proc_get_bb_reg_dump2(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
int len = 0;
int i,j=1;
@ -460,7 +460,7 @@ int proc_get_bb_reg_dump3(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
int len = 0;
int i,j=1;
@ -480,7 +480,7 @@ int proc_get_rf_reg_dump1(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
int len = 0;
int i,j=1,path;
u32 value;
@ -506,7 +506,7 @@ int proc_get_rf_reg_dump2(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
int len = 0;
int i,j=1,path;
u32 value;
@ -531,7 +531,7 @@ int proc_get_rf_reg_dump3(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
int len = 0;
int i,j=1,path;
u32 value;
@ -557,7 +557,7 @@ int proc_get_rf_reg_dump4(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
int len = 0;
int i,j=1,path;
u32 value;
@ -583,7 +583,7 @@ int proc_get_rx_signal(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
int len = 0;
@ -609,7 +609,7 @@ int proc_set_rx_signal(struct file *file, const char __user *buffer,
unsigned long count, void *data)
{
struct net_device *dev = (struct net_device *)data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
char tmp[32];
u32 is_signal_dbg;
s32 signal_strength;
@ -643,7 +643,7 @@ int proc_get_ht_enable(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct registry_priv *pregpriv = &padapter->registrypriv;
int len = 0;
@ -660,7 +660,7 @@ int proc_set_ht_enable(struct file *file, const char __user *buffer,
unsigned long count, void *data)
{
struct net_device *dev = (struct net_device *)data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct registry_priv *pregpriv = &padapter->registrypriv;
char tmp[32];
s32 mode;
@ -688,7 +688,7 @@ int proc_get_cbw40_enable(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct registry_priv *pregpriv = &padapter->registrypriv;
int len = 0;
@ -707,7 +707,7 @@ int proc_set_cbw40_enable(struct file *file, const char __user *buffer,
unsigned long count, void *data)
{
struct net_device *dev = (struct net_device *)data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct registry_priv *pregpriv = &padapter->registrypriv;
char tmp[32];
s32 mode;
@ -737,7 +737,7 @@ int proc_get_ampdu_enable(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct registry_priv *pregpriv = &padapter->registrypriv;
int len = 0;
@ -756,7 +756,7 @@ int proc_set_ampdu_enable(struct file *file, const char __user *buffer,
unsigned long count, void *data)
{
struct net_device *dev = (struct net_device *)data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct registry_priv *pregpriv = &padapter->registrypriv;
char tmp[32];
s32 mode;
@ -786,7 +786,7 @@ int proc_get_two_path_rssi(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
int len = 0;
@ -806,7 +806,7 @@ int proc_get_rx_stbc(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct registry_priv *pregpriv = &padapter->registrypriv;
int len = 0;
@ -825,7 +825,7 @@ int proc_set_rx_stbc(struct file *file, const char __user *buffer,
unsigned long count, void *data)
{
struct net_device *dev = (struct net_device *)data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct registry_priv *pregpriv = &padapter->registrypriv;
char tmp[32];
u32 mode;
@ -862,7 +862,7 @@ int proc_set_rssi_disp(struct file *file, const char __user *buffer,
unsigned long count, void *data)
{
struct net_device *dev = (struct net_device *)data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
char tmp[32];
u32 enable=0;
@ -908,7 +908,7 @@ int proc_get_all_sta_info(char *page, char **start,
unsigned long irqL;
struct sta_info *psta;
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct sta_priv *pstapriv = &padapter->stapriv;
int i, j;
struct list_head *plist, *phead;
@ -971,7 +971,7 @@ int proc_get_best_channel(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
int len = 0;
u32 i, best_channel_24G = 1, best_channel_5G = 36, index_24G = 0, index_5G = 0;
@ -1035,7 +1035,7 @@ int proc_get_btcoex_dbg(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct registry_priv *pregpriv = &padapter->registrypriv;
int len = 0;
@ -1054,7 +1054,7 @@ int proc_set_btcoex_dbg(struct file *file, const char __user *buffer,
unsigned long count, void *data)
{
struct net_device *dev = (struct net_device *)data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct registry_priv *pregpriv = &padapter->registrypriv;
char tmp[32];
u32 mode;

86
core/rtw_efuse.c
View file

@ -50,12 +50,12 @@ u8 fakeBTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN]={0};
bool
Efuse_Read1ByteFromFakeContent(
PADAPTER pAdapter,
struct adapter * pAdapter,
u16 Offset,
u8 *Value );
bool
Efuse_Read1ByteFromFakeContent(
PADAPTER pAdapter,
struct adapter * pAdapter,
u16 Offset,
u8 *Value )
{
@ -72,12 +72,12 @@ Efuse_Read1ByteFromFakeContent(
bool
Efuse_Write1ByteToFakeContent(
PADAPTER pAdapter,
struct adapter * pAdapter,
u16 Offset,
u8 Value );
bool
Efuse_Write1ByteToFakeContent(
PADAPTER pAdapter,
struct adapter * pAdapter,
u16 Offset,
u8 Value )
{
@ -114,7 +114,7 @@ Efuse_Write1ByteToFakeContent(
*---------------------------------------------------------------------------*/
void
Efuse_PowerSwitch(
PADAPTER pAdapter,
struct adapter * pAdapter,
u8 bWrite,
u8 PwrState)
{
@ -139,7 +139,7 @@ Efuse_PowerSwitch(
*---------------------------------------------------------------------------*/
u16
Efuse_GetCurrentSize(
PADAPTER pAdapter,
struct adapter * pAdapter,
u8 efuseType,
bool bPseudoTest)
{
@ -175,7 +175,7 @@ Efuse_CalculateWordCnts(u8 word_en)
/* */
void
ReadEFuseByte(
PADAPTER Adapter,
struct adapter * Adapter,
u16 _offset,
u8 *pbuf,
bool bPseudoTest)
@ -240,7 +240,7 @@ ReadEFuseByte(
void
efuse_ReadEFuse(
PADAPTER Adapter,
struct adapter * Adapter,
u8 efuseType,
u16 _offset,
u16 _size_byte,
@ -249,7 +249,7 @@ efuse_ReadEFuse(
);
void
efuse_ReadEFuse(
PADAPTER Adapter,
struct adapter * Adapter,
u8 efuseType,
u16 _offset,
u16 _size_byte,
@ -262,7 +262,7 @@ efuse_ReadEFuse(
void
EFUSE_GetEfuseDefinition(
PADAPTER pAdapter,
struct adapter * pAdapter,
u8 efuseType,
u8 type,
void *pOut,
@ -290,7 +290,7 @@ EFUSE_GetEfuseDefinition(
*---------------------------------------------------------------------------*/
u8
EFUSE_Read1Byte(
PADAPTER Adapter,
struct adapter * Adapter,
u16 Address)
{
u8 data;
@ -355,12 +355,12 @@ EFUSE_Read1Byte(
void
EFUSE_Write1Byte(
PADAPTER Adapter,
struct adapter * Adapter,
u16 Address,
u8 Value);
void
EFUSE_Write1Byte(
PADAPTER Adapter,
struct adapter * Adapter,
u16 Address,
u8 Value)
{
@ -408,7 +408,7 @@ EFUSE_Write1Byte(
/* 11/16/2008 MH Read one byte from real Efuse. */
u8
efuse_OneByteRead(
PADAPTER pAdapter,
struct adapter * pAdapter,
u16 addr,
u8 *data,
bool bPseudoTest)
@ -449,7 +449,7 @@ efuse_OneByteRead(
/* 11/16/2008 MH Write one byte to reald Efuse. */
u8
efuse_OneByteWrite(
PADAPTER pAdapter,
struct adapter * pAdapter,
u16 addr,
u8 data,
bool bPseudoTest)
@ -492,7 +492,7 @@ efuse_OneByteWrite(
}
int
Efuse_PgPacketRead( PADAPTER pAdapter,
Efuse_PgPacketRead( struct adapter * pAdapter,
u8 offset,
u8 *data,
bool bPseudoTest)
@ -505,7 +505,7 @@ Efuse_PgPacketRead( PADAPTER pAdapter,
}
int
Efuse_PgPacketWrite( PADAPTER pAdapter,
Efuse_PgPacketWrite( struct adapter * pAdapter,
u8 offset,
u8 word_en,
u8 *data,
@ -520,7 +520,7 @@ Efuse_PgPacketWrite( PADAPTER pAdapter,
static int
Efuse_PgPacketWrite_BT( PADAPTER pAdapter,
Efuse_PgPacketWrite_BT( struct adapter * pAdapter,
u8 offset,
u8 word_en,
u8 *data,
@ -579,7 +579,7 @@ efuse_WordEnableDataRead( u8 word_en,
u8
Efuse_WordEnableDataWrite( PADAPTER pAdapter,
Efuse_WordEnableDataWrite( struct adapter * pAdapter,
u16 efuse_addr,
u8 word_en,
u8 *data,
@ -592,12 +592,12 @@ Efuse_WordEnableDataWrite( PADAPTER pAdapter,
return ret;
}
static u8 efuse_read8(PADAPTER padapter, u16 address, u8 *value)
static u8 efuse_read8(struct adapter * padapter, u16 address, u8 *value)
{
return efuse_OneByteRead(padapter,address, value, false);
}
static u8 efuse_write8(PADAPTER padapter, u16 address, u8 *value)
static u8 efuse_write8(struct adapter * padapter, u16 address, u8 *value)
{
return efuse_OneByteWrite(padapter,address, *value, false);
}
@ -605,12 +605,12 @@ static u8 efuse_write8(PADAPTER padapter, u16 address, u8 *value)
/*
* read/wirte raw efuse data
*/
u8 rtw_efuse_access(PADAPTER padapter, u8 bWrite, u16 start_addr, u16 cnts, u8 *data)
u8 rtw_efuse_access(struct adapter * padapter, u8 bWrite, u16 start_addr, u16 cnts, u8 *data)
{
int i = 0;
u16 real_content_len = 0, max_available_size = 0;
u8 res = _FAIL ;
u8 (*rw8)(PADAPTER, u16, u8*);
u8 (*rw8)(struct adapter *, u16, u8*);
EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&real_content_len, false);
EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);
@ -643,14 +643,14 @@ u8 rtw_efuse_access(PADAPTER padapter, u8 bWrite, u16 start_addr, u16 cnts, u8 *
return res;
}
/* */
u16 efuse_GetMaxSize(PADAPTER padapter)
u16 efuse_GetMaxSize(struct adapter * padapter)
{
u16 max_size;
EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI , TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_size, false);
return max_size;
}
/* */
u8 efuse_GetCurrentSize(PADAPTER padapter, u16 *size)
u8 efuse_GetCurrentSize(struct adapter * padapter, u16 *size)
{
Efuse_PowerSwitch(padapter, false, true);
*size = Efuse_GetCurrentSize(padapter, EFUSE_WIFI, false);
@ -659,7 +659,7 @@ u8 efuse_GetCurrentSize(PADAPTER padapter, u16 *size)
return _SUCCESS;
}
/* */
u8 rtw_efuse_map_read(PADAPTER padapter, u16 addr, u16 cnts, u8 *data)
u8 rtw_efuse_map_read(struct adapter * padapter, u16 addr, u16 cnts, u8 *data)
{
u16 mapLen=0;
@ -677,7 +677,7 @@ u8 rtw_efuse_map_read(PADAPTER padapter, u16 addr, u16 cnts, u8 *data)
return _SUCCESS;
}
u8 rtw_BT_efuse_map_read(PADAPTER padapter, u16 addr, u16 cnts, u8 *data)
u8 rtw_BT_efuse_map_read(struct adapter * padapter, u16 addr, u16 cnts, u8 *data)
{
u16 mapLen=0;
@ -695,7 +695,7 @@ u8 rtw_BT_efuse_map_read(PADAPTER padapter, u16 addr, u16 cnts, u8 *data)
return _SUCCESS;
}
/* */
u8 rtw_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data)
u8 rtw_efuse_map_write(struct adapter * padapter, u16 addr, u16 cnts, u8 *data)
{
u8 offset, word_en;
u8 *map;
@ -787,7 +787,7 @@ exit:
}
/* */
u8 rtw_BT_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data)
u8 rtw_BT_efuse_map_write(struct adapter * padapter, u16 addr, u16 cnts, u8 *data)
{
u8 offset, word_en;
u8 *map;
@ -900,13 +900,13 @@ exit:
*---------------------------------------------------------------------------*/
void
Efuse_ReadAllMap(
PADAPTER pAdapter,
struct adapter * pAdapter,
u8 efuseType,
u8 *Efuse,
bool bPseudoTest);
void
Efuse_ReadAllMap(
PADAPTER pAdapter,
struct adapter * pAdapter,
u8 efuseType,
u8 *Efuse,
bool bPseudoTest)
@ -942,7 +942,7 @@ Efuse_ReadAllMap(
*---------------------------------------------------------------------------*/
static void
efuse_ShadowRead1Byte(
PADAPTER pAdapter,
struct adapter * pAdapter,
u16 Offset,
u8 *Value)
{
@ -955,7 +955,7 @@ efuse_ShadowRead1Byte(
/* Read Two Bytes */
static void
efuse_ShadowRead2Byte(
PADAPTER pAdapter,
struct adapter * pAdapter,
u16 Offset,
u16 *Value)
{
@ -969,7 +969,7 @@ efuse_ShadowRead2Byte(
/* Read Four Bytes */
static void
efuse_ShadowRead4Byte(
PADAPTER pAdapter,
struct adapter * pAdapter,
u16 Offset,
u32 *Value)
{
@ -1003,7 +1003,7 @@ efuse_ShadowRead4Byte(
*---------------------------------------------------------------------------*/
static void
efuse_ShadowWrite1Byte(
PADAPTER pAdapter,
struct adapter * pAdapter,
u16 Offset,
u8 Value)
{
@ -1016,7 +1016,7 @@ efuse_ShadowWrite1Byte(
/* Write Two Bytes */
static void
efuse_ShadowWrite2Byte(
PADAPTER pAdapter,
struct adapter * pAdapter,
u16 Offset,
u16 Value)
{
@ -1030,7 +1030,7 @@ efuse_ShadowWrite2Byte(
/* Write Four Bytes */
static void
efuse_ShadowWrite4Byte(
PADAPTER pAdapter,
struct adapter * pAdapter,
u16 Offset,
u32 Value)
{
@ -1060,7 +1060,7 @@ efuse_ShadowWrite4Byte(
*
*---------------------------------------------------------------------------*/
void EFUSE_ShadowMapUpdate(
PADAPTER pAdapter,
struct adapter * pAdapter,
u8 efuseType,
bool bPseudoTest)
{
@ -1093,7 +1093,7 @@ void EFUSE_ShadowMapUpdate(
*---------------------------------------------------------------------------*/
void
EFUSE_ShadowRead(
PADAPTER pAdapter,
struct adapter * pAdapter,
u8 Type,
u16 Offset,
u32 *Value )
@ -1125,13 +1125,13 @@ EFUSE_ShadowRead(
*---------------------------------------------------------------------------*/
void
EFUSE_ShadowWrite(
PADAPTER pAdapter,
struct adapter * pAdapter,
u8 Type,
u16 Offset,
u32 Value);
void
EFUSE_ShadowWrite(
PADAPTER pAdapter,
struct adapter * pAdapter,
u8 Type,
u16 Offset,
u32 Value)
@ -1154,11 +1154,11 @@ EFUSE_ShadowWrite(
void
Efuse_InitSomeVar(
PADAPTER pAdapter
struct adapter * pAdapter
);
void
Efuse_InitSomeVar(
PADAPTER pAdapter
struct adapter * pAdapter
)
{
u8 i;

36
core/rtw_io.c
View file

@ -52,7 +52,7 @@ jackson@realtek.com.tw
#define rtw_cpu_to_le32(val) cpu_to_le32(val)
u8 _rtw_read8(_adapter *adapter, u32 addr)
u8 _rtw_read8(struct adapter *adapter, u32 addr)
{
u8 r_val;
/* struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; */
@ -67,7 +67,7 @@ u8 _rtw_read8(_adapter *adapter, u32 addr)
return r_val;
}
u16 _rtw_read16(_adapter *adapter, u32 addr)
u16 _rtw_read16(struct adapter *adapter, u32 addr)
{
u16 r_val;
struct io_priv *pio_priv = &adapter->iopriv;
@ -81,7 +81,7 @@ _func_exit_;
return r_val;
}
u32 _rtw_read32(_adapter *adapter, u32 addr)
u32 _rtw_read32(struct adapter *adapter, u32 addr)
{
u32 r_val;
struct io_priv *pio_priv = &adapter->iopriv;
@ -95,7 +95,7 @@ _func_exit_;
return r_val;
}
int _rtw_write8(_adapter *adapter, u32 addr, u8 val)
int _rtw_write8(struct adapter *adapter, u32 addr, u8 val)
{
struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf);
@ -110,7 +110,7 @@ int _rtw_write8(_adapter *adapter, u32 addr, u8 val)
return RTW_STATUS_CODE(ret);
}
int _rtw_write16(_adapter *adapter, u32 addr, u16 val)
int _rtw_write16(struct adapter *adapter, u32 addr, u16 val)
{
struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf);
@ -124,7 +124,7 @@ int _rtw_write16(_adapter *adapter, u32 addr, u16 val)
return RTW_STATUS_CODE(ret);
}
int _rtw_write32(_adapter *adapter, u32 addr, u32 val)
int _rtw_write32(struct adapter *adapter, u32 addr, u32 val)
{
struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf);
@ -139,7 +139,7 @@ int _rtw_write32(_adapter *adapter, u32 addr, u32 val)
return RTW_STATUS_CODE(ret);
}
int _rtw_writeN(_adapter *adapter, u32 addr ,u32 length , u8 *pdata)
int _rtw_writeN(struct adapter *adapter, u32 addr ,u32 length , u8 *pdata)
{
struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = (struct intf_hdl*)(&(pio_priv->intf));
@ -153,7 +153,7 @@ int _rtw_writeN(_adapter *adapter, u32 addr ,u32 length , u8 *pdata)
return RTW_STATUS_CODE(ret);
}
int _rtw_write8_async(_adapter *adapter, u32 addr, u8 val)
int _rtw_write8_async(struct adapter *adapter, u32 addr, u8 val)
{
struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf);
@ -168,7 +168,7 @@ int _rtw_write8_async(_adapter *adapter, u32 addr, u8 val)
return RTW_STATUS_CODE(ret);
}
int _rtw_write16_async(_adapter *adapter, u32 addr, u16 val)
int _rtw_write16_async(struct adapter *adapter, u32 addr, u16 val)
{
struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf);
@ -183,7 +183,7 @@ _func_exit_;
return RTW_STATUS_CODE(ret);
}
int _rtw_write32_async(_adapter *adapter, u32 addr, u32 val)
int _rtw_write32_async(struct adapter *adapter, u32 addr, u32 val)
{
struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf);
@ -198,7 +198,7 @@ _func_exit_;
return RTW_STATUS_CODE(ret);
}
void _rtw_read_mem(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
void _rtw_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
{
void (*_read_mem)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem);
struct io_priv *pio_priv = &adapter->iopriv;
@ -220,7 +220,7 @@ void _rtw_read_mem(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
}
void _rtw_write_mem(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
void _rtw_write_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
{
void (*_write_mem)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem);
struct io_priv *pio_priv = &adapter->iopriv;
@ -236,7 +236,7 @@ void _rtw_write_mem(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
}
void _rtw_read_port(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
void _rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
{
u32 (*_read_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem);
struct io_priv *pio_priv = &adapter->iopriv;
@ -258,7 +258,7 @@ void _rtw_read_port(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
}
void _rtw_read_port_cancel(_adapter *adapter)
void _rtw_read_port_cancel(struct adapter *adapter)
{
void (*_read_port_cancel)(struct intf_hdl *pintfhdl);
struct io_priv *pio_priv = &adapter->iopriv;
@ -271,7 +271,7 @@ void _rtw_read_port_cancel(_adapter *adapter)
}
u32 _rtw_write_port(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
u32 _rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
{
u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem);
struct io_priv *pio_priv = &adapter->iopriv;
@ -289,7 +289,7 @@ u32 _rtw_write_port(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
return ret;
}
u32 _rtw_write_port_and_wait(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem, int timeout_ms)
u32 _rtw_write_port_and_wait(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem, int timeout_ms)
{
int ret = _SUCCESS;
struct xmit_buf *pxmitbuf = (struct xmit_buf *)pmem;
@ -306,7 +306,7 @@ u32 _rtw_write_port_and_wait(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem, int
return ret;
}
void _rtw_write_port_cancel(_adapter *adapter)
void _rtw_write_port_cancel(struct adapter *adapter)
{
void (*_write_port_cancel)(struct intf_hdl *pintfhdl);
struct io_priv *pio_priv = &adapter->iopriv;
@ -319,7 +319,7 @@ void _rtw_write_port_cancel(_adapter *adapter)
}
int rtw_init_io_priv(_adapter *padapter, void (*set_intf_ops)(struct _io_ops *pops))
int rtw_init_io_priv(struct adapter *padapter, void (*set_intf_ops)(struct _io_ops *pops))
{
struct io_priv *piopriv = &padapter->iopriv;
struct intf_hdl *pintf = &piopriv->intf;

42
core/rtw_ioctl_set.c
View file

@ -28,7 +28,7 @@
#include <usb_osintf.h>
#include <usb_ops.h>
extern void indicate_wx_scan_complete_event(_adapter *padapter);
extern void indicate_wx_scan_complete_event(struct adapter *padapter);
#define IS_MAC_ADDRESS_BROADCAST(addr) \
( \
@ -67,8 +67,8 @@ _func_exit_;
return ret;
}
u8 rtw_do_join(_adapter * padapter);
u8 rtw_do_join(_adapter * padapter)
u8 rtw_do_join(struct adapter * padapter);
u8 rtw_do_join(struct adapter * padapter)
{
unsigned long irqL;
struct list_head *plist, *phead;
@ -181,7 +181,7 @@ _func_exit_;
return ret;
}
u8 rtw_set_802_11_bssid(_adapter* padapter, u8 *bssid)
u8 rtw_set_802_11_bssid(struct adapter* padapter, u8 *bssid)
{
unsigned long irqL;
u8 status=_SUCCESS;
@ -277,7 +277,7 @@ _func_exit_;
return status;
}
u8 rtw_set_802_11_ssid(_adapter* padapter, struct ndis_802_11_ssid *ssid)
u8 rtw_set_802_11_ssid(struct adapter* padapter, struct ndis_802_11_ssid *ssid)
{
unsigned long irqL;
u8 status = _SUCCESS;
@ -400,7 +400,7 @@ _func_exit_;
}
u8 rtw_set_802_11_infrastructure_mode(_adapter* padapter,
u8 rtw_set_802_11_infrastructure_mode(struct adapter* padapter,
enum ndis_802_11_network_infra networktype)
{
unsigned long irqL;
@ -481,7 +481,7 @@ _func_exit_;
}
u8 rtw_set_802_11_disassociate(_adapter *padapter)
u8 rtw_set_802_11_disassociate(struct adapter *padapter)
{
unsigned long irqL;
struct mlme_priv * pmlmepriv = &padapter->mlmepriv;
@ -507,7 +507,7 @@ _func_exit_;
return true;
}
u8 rtw_set_802_11_bssid_list_scan(_adapter* padapter, struct 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)
{
unsigned long irqL;
struct mlme_priv *pmlmepriv= &padapter->mlmepriv;
@ -559,7 +559,7 @@ _func_exit_;
return res;
}
u8 rtw_set_802_11_authentication_mode(_adapter* padapter, enum ndis_802_11_auth_mode authmode)
u8 rtw_set_802_11_authentication_mode(struct adapter* padapter, enum ndis_802_11_auth_mode authmode)
{
struct security_priv *psecuritypriv = &padapter->securitypriv;
int res;
@ -588,7 +588,7 @@ _func_exit_;
return ret;
}
u8 rtw_set_802_11_add_wep(_adapter* padapter, struct ndis_802_11_wep *wep){
u8 rtw_set_802_11_add_wep(struct adapter* padapter, struct ndis_802_11_wep *wep){
int keyid,res;
struct security_priv* psecuritypriv=&(padapter->securitypriv);
@ -647,7 +647,7 @@ _func_exit_;
}
u8 rtw_set_802_11_remove_wep(_adapter* padapter, u32 keyindex){
u8 rtw_set_802_11_remove_wep(struct adapter* padapter, u32 keyindex){
u8 ret=_SUCCESS;
@ -690,7 +690,7 @@ _func_exit_;
}
u8 rtw_set_802_11_add_key(_adapter* padapter, struct 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;
@ -1053,7 +1053,7 @@ _func_exit_;
return ret;
}
u8 rtw_set_802_11_remove_key(_adapter* padapter, struct ndis_802_11_remove_key *key){
u8 rtw_set_802_11_remove_key(struct adapter* padapter, struct ndis_802_11_remove_key *key){
u8 *pbssid;
struct sta_info *stainfo;
@ -1095,11 +1095,11 @@ _func_exit_;
/*
* rtw_get_cur_max_rate -
* @adapter: pointer to _adapter structure
* @adapter: pointer to struct adapter structure
*
* Return 0 or 100Kbps
*/
u16 rtw_get_cur_max_rate(_adapter *adapter)
u16 rtw_get_cur_max_rate(struct adapter *adapter)
{
int i = 0;
u8 *p;
@ -1171,12 +1171,12 @@ u16 rtw_get_cur_max_rate(_adapter *adapter)
/*
* rtw_set_scan_mode -
* @adapter: pointer to _adapter structure
* @adapter: pointer to struct adapter structure
* @scan_mode:
*
* Return _SUCCESS or _FAIL
*/
int rtw_set_scan_mode(_adapter *adapter, enum rt_scan_type scan_mode)
int rtw_set_scan_mode(struct adapter *adapter, enum rt_scan_type scan_mode)
{
if (scan_mode != SCAN_ACTIVE && scan_mode != SCAN_PASSIVE)
return _FAIL;
@ -1188,12 +1188,12 @@ int rtw_set_scan_mode(_adapter *adapter, enum rt_scan_type scan_mode)
/*
* rtw_set_channel_plan -
* @adapter: pointer to _adapter structure
* @adapter: pointer to struct adapter structure
* @channel_plan:
*
* Return _SUCCESS or _FAIL
*/
int rtw_set_channel_plan(_adapter *adapter, u8 channel_plan)
int rtw_set_channel_plan(struct adapter *adapter, u8 channel_plan)
{
struct registry_priv *pregistrypriv = &adapter->registrypriv;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@ -1204,12 +1204,12 @@ int rtw_set_channel_plan(_adapter *adapter, u8 channel_plan)
/*
* rtw_set_country -
* @adapter: pointer to _adapter structure
* @adapter: pointer to struct adapter structure
* @country_code: string of country code
*
* Return _SUCCESS or _FAIL
*/
int rtw_set_country(_adapter *adapter, const char *country_code)
int rtw_set_country(struct adapter *adapter, const char *country_code)
{
int channel_plan = RT_CHANNEL_DOMAIN_WORLD_WIDE_5G;

8
core/rtw_iol.c
View file

@ -20,7 +20,7 @@
#include<rtw_iol.h>
struct xmit_frame *rtw_IOL_accquire_xmit_frame(ADAPTER *adapter)
struct xmit_frame *rtw_IOL_accquire_xmit_frame(struct adapter *adapter)
{
struct xmit_frame *xmit_frame;
struct xmit_buf *xmitbuf;
@ -94,7 +94,7 @@ int rtw_IOL_append_cmds(struct xmit_frame *xmit_frame, u8 *IOL_cmds, u32 cmd_len
return _SUCCESS;
}
bool rtw_IOL_applied(ADAPTER *adapter)
bool rtw_IOL_applied(struct adapter *adapter)
{
if (1 == adapter->registrypriv.fw_iol)
return true;
@ -104,7 +104,7 @@ bool rtw_IOL_applied(ADAPTER *adapter)
return false;
}
int rtw_IOL_exec_cmds_sync(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt)
int rtw_IOL_exec_cmds_sync(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt)
{
return rtw_hal_iol_cmd(adapter, xmit_frame, max_wating_ms,bndy_cnt);
}
@ -216,7 +216,7 @@ u8 rtw_IOL_cmd_boundary_handle(struct xmit_frame *pxmit_frame)
return is_cmd_bndy;
}
void rtw_IOL_cmd_buf_dump(ADAPTER *Adapter,int buf_len,u8 *pbuf)
void rtw_IOL_cmd_buf_dump(struct adapter *Adapter,int buf_len,u8 *pbuf)
{
int i;
int j=1;

40
core/rtw_led.c
View file

@ -29,7 +29,7 @@
void BlinkTimerCallback(void *data)
{
struct LED_871x * pLed = (struct LED_871x *)data;
_adapter *padapter = pLed->padapter;
struct adapter *padapter = pLed->padapter;
if ( (padapter->bSurpriseRemoved == true) || ( padapter->bDriverStopped == true))
{
@ -75,7 +75,7 @@ void ResetLedStatus(struct LED_871x * pLed) {
/* Initialize an LED_871x object. */
void
InitLed871x(
_adapter *padapter,
struct adapter *padapter,
struct LED_871x *pLed,
enum LED_PIN_871x LedPin
)
@ -112,15 +112,15 @@ DeInitLed871x(
/* It toggle off LED and schedule corresponding timer if necessary. */
/* */
void SwLedOn(_adapter *padapter, struct LED_871x * pLed);
void SwLedOff(_adapter *padapter, struct LED_871x *pLed);
void SwLedOn(struct adapter *padapter, struct LED_871x * pLed);
void SwLedOff(struct adapter *padapter, struct LED_871x *pLed);
static void
SwLedBlink(
struct LED_871x * pLed
)
{
_adapter *padapter = pLed->padapter;
struct adapter *padapter = pLed->padapter;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
u8 bStopBlinking = false;
@ -238,7 +238,7 @@ SwLedBlink1(
struct LED_871x * pLed
)
{
_adapter *padapter = pLed->padapter;
struct adapter *padapter = pLed->padapter;
struct led_priv *ledpriv = &(padapter->ledpriv);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct LED_871x * pLed1 = &(ledpriv->SwLed1);
@ -413,7 +413,7 @@ SwLedBlink2(
struct LED_871x * pLed
)
{
_adapter *padapter = pLed->padapter;
struct adapter *padapter = pLed->padapter;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
u8 bStopBlinking = false;
@ -535,7 +535,7 @@ SwLedBlink3(
struct LED_871x * pLed
)
{
_adapter *padapter = pLed->padapter;
struct adapter *padapter = pLed->padapter;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
u8 bStopBlinking = false;
@ -706,7 +706,7 @@ SwLedBlink4(
struct LED_871x * pLed
)
{
_adapter *padapter = pLed->padapter;
struct adapter *padapter = pLed->padapter;
struct led_priv *ledpriv = &(padapter->ledpriv);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct LED_871x *pLed1 = &(ledpriv->SwLed1);
@ -905,7 +905,7 @@ SwLedBlink5(
struct LED_871x * pLed
)
{
_adapter *padapter = pLed->padapter;
struct adapter *padapter = pLed->padapter;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
u8 bStopBlinking = false;
@ -1023,7 +1023,7 @@ SwLedBlink6(
struct LED_871x * pLed
)
{
_adapter *padapter = pLed->padapter;
struct adapter *padapter = pLed->padapter;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
u8 bStopBlinking = false;
@ -1044,7 +1044,7 @@ SwLedBlink6(
static void
SwLedControlMode0(
_adapter *padapter,
struct adapter *padapter,
enum LED_CTL_MODE LedAction
)
{
@ -1159,7 +1159,7 @@ SwLedControlMode0(
/* ALPHA, added by chiyoko, 20090106 */
static void
SwLedControlMode1(
_adapter *padapter,
struct adapter *padapter,
enum LED_CTL_MODE LedAction
)
{
@ -1425,7 +1425,7 @@ SwLedControlMode1(
/* Arcadyan/Sitecom , added by chiyoko, 20090216 */
static void
SwLedControlMode2(
_adapter *padapter,
struct adapter *padapter,
enum LED_CTL_MODE LedAction
)
{
@ -1590,7 +1590,7 @@ SwLedControlMode2(
/* COREGA, added by chiyoko, 20090316 */
static void
SwLedControlMode3(
_adapter *padapter,
struct adapter *padapter,
enum LED_CTL_MODE LedAction
)
{
@ -1769,7 +1769,7 @@ SwLedControlMode2(
/* Edimax-Belkin, added by chiyoko, 20090413 */
static void
SwLedControlMode4(
_adapter *padapter,
struct adapter *padapter,
enum LED_CTL_MODE LedAction
)
{
@ -2101,7 +2101,7 @@ SwLedControlMode4(
/* Sercomm-Belkin, added by chiyoko, 20090415 */
static void
SwLedControlMode5(
_adapter *padapter,
struct adapter *padapter,
enum LED_CTL_MODE LedAction
)
{
@ -2183,7 +2183,7 @@ SwLedControlMode5(
/* WNC-Corega, added by chiyoko, 20090902 */
static void
SwLedControlMode6(
_adapter *padapter,
struct adapter *padapter,
enum LED_CTL_MODE LedAction
)
{
@ -2220,7 +2220,7 @@ SwLedControlMode6(
/* */
void BlinkHandler(struct LED_871x * pLed)
{
_adapter *padapter = pLed->padapter;
struct adapter *padapter = pLed->padapter;
struct led_priv *ledpriv = &(padapter->ledpriv);
if ( (padapter->bSurpriseRemoved == true) || ( padapter->bDriverStopped == true))
@ -2263,7 +2263,7 @@ void BlinkHandler(struct LED_871x * pLed)
void
LedControl871x(
_adapter *padapter,
struct adapter *padapter,
enum LED_CTL_MODE LedAction
)
{

114
core/rtw_mlme.c
View file

@ -32,13 +32,13 @@
#include <rtw_ioctl_set.h>
#include <usb_osintf.h>
extern void indicate_wx_scan_complete_event(_adapter *padapter);
extern u8 rtw_do_join(_adapter * padapter);
extern void indicate_wx_scan_complete_event(struct adapter *padapter);
extern u8 rtw_do_join(struct adapter * padapter);
extern unsigned char MCS_rate_2R[16];
extern unsigned char MCS_rate_1R[16];
int _rtw_init_mlme_priv (_adapter* padapter)
int _rtw_init_mlme_priv (struct adapter* padapter)
{
int i;
u8 *pbuf;
@ -353,7 +353,7 @@ _func_exit_;
}
void _rtw_free_network_queue(_adapter *padapter, u8 isfreeall)
void _rtw_free_network_queue(struct adapter *padapter, u8 isfreeall)
{
unsigned long irqL;
struct list_head *phead, *plist;
@ -389,7 +389,7 @@ _func_exit_;
int rtw_if_up(_adapter *padapter) {
int rtw_if_up(struct adapter *padapter) {
int res;
_func_enter_;
@ -450,7 +450,7 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie)
}
int rtw_init_mlme_priv (_adapter *padapter)/* struct mlme_priv *pmlmepriv) */
int rtw_init_mlme_priv (struct adapter *padapter)/* struct mlme_priv *pmlmepriv) */
{
int res;
_func_enter_;
@ -515,7 +515,7 @@ _func_exit_;
}
void rtw_free_network_queue(_adapter* dev, u8 isfreeall)
void rtw_free_network_queue(struct adapter* dev, u8 isfreeall)
{
_func_enter_;
_rtw_free_network_queue(dev, isfreeall);
@ -534,7 +534,7 @@ struct wlan_network *rtw_find_network(struct __queue *scanned_queue, u8 *addr)
return pnetwork;
}
int rtw_is_same_ibss(_adapter *adapter, struct wlan_network *pnetwork)
int rtw_is_same_ibss(struct adapter *adapter, struct wlan_network *pnetwork)
{
int ret=true;
struct security_priv *psecuritypriv = &adapter->securitypriv;
@ -623,7 +623,7 @@ _func_exit_;
}
void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,
_adapter * padapter, bool update_ie)
struct adapter * padapter, bool update_ie)
{
u8 ss_ori = dst->PhyInfo.SignalStrength;
u8 sq_ori = dst->PhyInfo.SignalQuality;
@ -696,7 +696,7 @@ _func_enter_;
_func_exit_;
}
static void update_current_network(_adapter *adapter, struct wlan_bssid_ex *pnetwork)
static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex *pnetwork)
{
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
@ -714,7 +714,7 @@ _func_exit_;
/*
Caller must hold pmlmepriv->lock first.
*/
void rtw_update_scanned_network(_adapter *adapter, struct wlan_bssid_ex *target)
void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *target)
{
unsigned long irqL;
struct list_head *plist, *phead;
@ -822,10 +822,10 @@ exit:
_func_exit_;
}
void rtw_add_network(_adapter *adapter, struct wlan_bssid_ex *pnetwork)
void rtw_add_network(struct adapter *adapter, struct wlan_bssid_ex *pnetwork)
{
unsigned long irqL;
struct mlme_priv *pmlmepriv = &(((_adapter *)adapter)->mlmepriv);
struct mlme_priv *pmlmepriv = &(((struct adapter *)adapter)->mlmepriv);
_func_enter_;
@ -847,7 +847,7 @@ _func_exit_;
/* (3) WMM */
/* (4) HT */
/* (5) others */
static int rtw_is_desired_network(_adapter *adapter, struct wlan_network *pnetwork)
static int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwork)
{
struct security_priv *psecuritypriv = &adapter->securitypriv;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@ -896,7 +896,7 @@ static int rtw_is_desired_network(_adapter *adapter, struct wlan_network *pnetwo
}
/* TODO: Perry : For Power Management */
void rtw_atimdone_event_callback(_adapter *adapter , u8 *pbuf)
void rtw_atimdone_event_callback(struct adapter *adapter , u8 *pbuf)
{
_func_enter_;
@ -906,7 +906,7 @@ _func_exit_;
}
void rtw_survey_event_callback(_adapter *adapter, u8 *pbuf)
void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)
{
unsigned long irqL;
u32 len;
@ -970,7 +970,7 @@ _func_exit_;
void rtw_surveydone_event_callback(_adapter *adapter, u8 *pbuf)
void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
{
unsigned long irqL;
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
@ -1089,12 +1089,12 @@ _func_exit_;
}
void rtw_dummy_event_callback(_adapter *adapter , u8 *pbuf)
void rtw_dummy_event_callback(struct adapter *adapter , u8 *pbuf)
{
}
void rtw_fwdbg_event_callback(_adapter *adapter , u8 *pbuf)
void rtw_fwdbg_event_callback(struct adapter *adapter , u8 *pbuf)
{
}
@ -1133,7 +1133,7 @@ _func_exit_;
/*
*rtw_free_assoc_resources: the caller has to lock pmlmepriv->lock
*/
void rtw_free_assoc_resources(_adapter *adapter, int lock_scanned_queue)
void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue)
{
unsigned long irqL;
struct wlan_network* pwlan = NULL;
@ -1191,7 +1191,7 @@ _func_exit_;
/*
*rtw_indicate_connect: the caller has to lock pmlmepriv->lock
*/
void rtw_indicate_connect(_adapter *padapter)
void rtw_indicate_connect(struct adapter *padapter)
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -1223,7 +1223,7 @@ _func_exit_;
/*
*rtw_indicate_disconnect: the caller has to lock pmlmepriv->lock
*/
void rtw_indicate_disconnect( _adapter *padapter )
void rtw_indicate_disconnect( struct adapter *padapter )
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@ -1264,12 +1264,12 @@ _func_enter_;
_func_exit_;
}
inline void rtw_indicate_scan_done( _adapter *padapter, bool aborted)
inline void rtw_indicate_scan_done( struct adapter *padapter, bool aborted)
{
rtw_os_indicate_scan_done(padapter, aborted);
}
void rtw_scan_abort(_adapter *adapter)
void rtw_scan_abort(struct adapter *adapter)
{
u32 cnt=0;
u32 start;
@ -1296,7 +1296,7 @@ void rtw_scan_abort(_adapter *adapter)
pmlmeext->scan_abort = false;
}
static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wlan_network *pnetwork)
static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, struct wlan_network *pnetwork)
{
int i;
struct sta_info *bmc_sta, *psta=NULL;
@ -1387,7 +1387,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl
/* pnetwork : returns from rtw_joinbss_event_callback */
/* ptarget_wlan: found from scanned_queue */
static void rtw_joinbss_update_network(_adapter *padapter, struct wlan_network *ptarget_wlan, struct wlan_network *pnetwork)
static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_network *ptarget_wlan, struct wlan_network *pnetwork)
{
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct wlan_network *cur_network = &(pmlmepriv->cur_network);
@ -1460,7 +1460,7 @@ static void rtw_joinbss_update_network(_adapter *padapter, struct wlan_network *
/* if join_res > 0, for (fw_state==WIFI_ADHOC_STATE), we only check if "ptarget_wlan" exist. */
/* if join_res > 0, update "cur_network->network" from "pnetwork->network" if (ptarget_wlan !=NULL). */
void rtw_joinbss_event_prehandle(_adapter *adapter, u8 *pbuf)
void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
{
unsigned long irqL,irqL2;
u8 timer_cancelled;
@ -1590,7 +1590,7 @@ ignore_nolock:
_func_exit_;
}
void rtw_joinbss_event_callback(_adapter *adapter, u8 *pbuf)
void rtw_joinbss_event_callback(struct adapter *adapter, u8 *pbuf)
{
struct wlan_network *pnetwork = (struct wlan_network *)pbuf;
@ -1603,7 +1603,7 @@ _func_enter_;
_func_exit_;
}
static u8 search_max_mac_id(_adapter *padapter)
static u8 search_max_mac_id(struct adapter *padapter)
{
u8 mac_id, aid;
#if (RATE_ADAPTIVE_SUPPORT==1) /* for 88E RA */
@ -1639,7 +1639,7 @@ static u8 search_max_mac_id(_adapter *padapter)
}
/* FOR AP ,AD-HOC mode */
void rtw_stassoc_hw_rpt(_adapter *adapter,struct sta_info *psta)
void rtw_stassoc_hw_rpt(struct adapter *adapter,struct sta_info *psta)
{
u16 media_status;
@ -1655,7 +1655,7 @@ void rtw_stassoc_hw_rpt(_adapter *adapter,struct sta_info *psta)
rtw_hal_set_hwreg(adapter,HW_VAR_H2C_MEDIA_STATUS_RPT,(u8 *)&media_status);
}
void rtw_stassoc_event_callback(_adapter *adapter, u8 *pbuf)
void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)
{
unsigned long irqL;
struct sta_info *psta;
@ -1746,7 +1746,7 @@ _func_exit_;
}
void rtw_stadel_event_callback(_adapter *adapter, u8 *pbuf)
void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
{
unsigned long irqL,irqL2;
int mac_id=-1;
@ -1867,7 +1867,7 @@ _func_exit_;
}
void rtw_cpwm_event_callback(PADAPTER padapter, u8 *pbuf)
void rtw_cpwm_event_callback(struct adapter * padapter, u8 *pbuf)
{
_func_enter_;
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("+rtw_cpwm_event_callback !!!\n"));
@ -1876,9 +1876,9 @@ _func_exit_;
/*
* _rtw_join_timeout_handler - Timeout/faliure handler for CMD JoinBss
* @adapter: pointer to _adapter structure
* @adapter: pointer to struct adapter structure
*/
void _rtw_join_timeout_handler (_adapter *adapter)
void _rtw_join_timeout_handler (struct adapter *adapter)
{
unsigned long irqL;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@ -1922,9 +1922,9 @@ _func_exit_;
/*
* rtw_scan_timeout_handler - Timeout/Faliure handler for CMD SiteSurvey
* @adapter: pointer to _adapter structure
* @adapter: pointer to struct adapter structure
*/
void rtw_scan_timeout_handler (_adapter *adapter)
void rtw_scan_timeout_handler (struct adapter *adapter)
{
unsigned long irqL;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@ -1941,7 +1941,7 @@ void rtw_scan_timeout_handler (_adapter *adapter)
}
static void rtw_auto_scan_handler(_adapter *padapter)
static void rtw_auto_scan_handler(struct adapter *padapter)
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
@ -1964,7 +1964,7 @@ static void rtw_auto_scan_handler(_adapter *padapter)
}
void rtw_dynamic_check_timer_handlder(_adapter *adapter)
void rtw_dynamic_check_timer_handlder(struct adapter *adapter)
{
#ifdef CONFIG_AP_MODE
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@ -2046,7 +2046,7 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv
, struct wlan_network **candidate, struct wlan_network *competitor)
{
int updated = false;
_adapter *adapter = container_of(pmlmepriv, _adapter, mlmepriv);
struct adapter *adapter = container_of(pmlmepriv, struct adapter, mlmepriv);
/* check bssid, if needed */
@ -2105,7 +2105,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv )
unsigned long irqL;
int ret;
struct list_head *phead;
_adapter *adapter;
struct adapter *adapter;
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL;
struct wlan_network *candidate = NULL;
@ -2115,7 +2115,7 @@ _func_enter_;
_enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
phead = get_list_head(queue);
adapter = (_adapter *)pmlmepriv->nic_hdl;
adapter = (struct adapter *)pmlmepriv->nic_hdl;
pmlmepriv->pscanned = get_next( phead );
@ -2178,7 +2178,7 @@ _func_exit_;
return ret;
}
int rtw_set_auth(_adapter * adapter,struct security_priv *psecuritypriv)
int rtw_set_auth(struct adapter * adapter,struct security_priv *psecuritypriv)
{
struct cmd_obj* pcmd;
struct setauth_parm *psetauthparm;
@ -2225,7 +2225,7 @@ _func_exit_;
}
int rtw_set_key(_adapter * adapter, struct security_priv *psecuritypriv, int keyid, u8 set_tx)
int rtw_set_key(struct adapter * adapter, struct security_priv *psecuritypriv, int keyid, u8 set_tx)
{
u8 keylen;
struct cmd_obj *pcmd;
@ -2313,7 +2313,7 @@ _func_exit_;
/* adjust IEs for rtw_joinbss_cmd in WMM */
int rtw_restruct_wmm_ie(_adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len, uint initial_out_len)
int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len, uint initial_out_len)
{
unsigned int ielength=0;
unsigned int i, j;
@ -2358,7 +2358,7 @@ int rtw_restruct_wmm_ie(_adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len, u
/* */
/* */
static int SecIsInPMKIDList(_adapter *Adapter, u8 *bssid)
static int SecIsInPMKIDList(struct adapter *Adapter, u8 *bssid)
{
struct security_priv *psecuritypriv=&Adapter->securitypriv;
int i=0;
@ -2399,7 +2399,7 @@ static int SecIsInPMKIDList(_adapter *Adapter, u8 *bssid)
/* 13th element in the array is the IE length */
/* */
static int rtw_append_pmkid(_adapter *Adapter,int iEntry, u8 *ie, uint ie_len)
static int rtw_append_pmkid(struct adapter *Adapter,int iEntry, u8 *ie, uint ie_len)
{
struct security_priv *psecuritypriv=&Adapter->securitypriv;
@ -2419,7 +2419,7 @@ static int rtw_append_pmkid(_adapter *Adapter,int iEntry, u8 *ie, uint ie_len)
}
int rtw_restruct_sec_ie(_adapter *adapter,u8 *in_ie, u8 *out_ie, uint in_len)
int rtw_restruct_sec_ie(struct adapter *adapter,u8 *in_ie, u8 *out_ie, uint in_len)
{
u8 authmode, securitytype, match;
u8 sec_ie[255], uncst_oui[4], bkup_ie[255];
@ -2478,7 +2478,7 @@ _func_exit_;
return ielength;
}
void rtw_init_registrypriv_dev_network( _adapter* adapter)
void rtw_init_registrypriv_dev_network( struct adapter* adapter)
{
struct registry_priv* pregistrypriv = &adapter->registrypriv;
struct eeprom_priv* peepriv = &adapter->eeprompriv;
@ -2503,7 +2503,7 @@ _func_exit_;
}
void rtw_update_registrypriv_dev_network(_adapter* adapter)
void rtw_update_registrypriv_dev_network(struct adapter* adapter)
{
int sz=0;
struct registry_priv* pregistrypriv = &adapter->registrypriv;
@ -2569,7 +2569,7 @@ _func_exit_;
}
void rtw_get_encrypt_decrypt_from_registrypriv(_adapter* adapter)
void rtw_get_encrypt_decrypt_from_registrypriv(struct adapter* adapter)
{
_func_enter_;
@ -2579,7 +2579,7 @@ _func_exit_;
}
/* the fucntion is at passive_level */
void rtw_joinbss_reset(_adapter *padapter)
void rtw_joinbss_reset(struct adapter *padapter)
{
u8 threshold;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -2622,7 +2622,7 @@ void rtw_joinbss_reset(_adapter *padapter)
#ifdef CONFIG_80211N_HT
/* the fucntion is >= passive_level */
unsigned int rtw_restructure_ht_ie(_adapter *padapter, u8 *in_ie, u8 *out_ie, uint in_len, uint *pout_len)
unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ie, uint in_len, uint *pout_len)
{
u32 ielen, out_len;
HT_CAP_AMPDU_FACTOR max_rx_ampdu_factor;
@ -2700,7 +2700,7 @@ unsigned int rtw_restructure_ht_ie(_adapter *padapter, u8 *in_ie, u8 *out_ie, ui
}
/* the fucntion is > passive_level (in critical_section) */
void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len)
void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len)
{
u8 *p, max_ampdu_sz;
int len;
@ -2808,7 +2808,7 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len)
pmlmeinfo->HT_protection = pmlmeinfo->HT_info.infos[1] & 0x3;
}
void rtw_issue_addbareq_cmd(_adapter *padapter, struct xmit_frame *pxmitframe)
void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitframe)
{
u8 issued;
int priority;
@ -2849,7 +2849,7 @@ void rtw_issue_addbareq_cmd(_adapter *padapter, struct xmit_frame *pxmitframe)
#endif
void rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network)
void rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network)
{
unsigned long irqL;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -2858,7 +2858,7 @@ void rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network)
_rtw_roaming(padapter, tgt_network);
_exit_critical_bh(&pmlmepriv->lock, &irqL);
}
void _rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network)
void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network)
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
int do_join_r;

228
core/rtw_mlme_ext.c
View file

@ -203,7 +203,7 @@ Following are the initialization functions for WiFi MLME
*****************************************************************************/
int init_hw_mlme_ext(_adapter *padapter)
int init_hw_mlme_ext(struct adapter *padapter)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -211,7 +211,7 @@ int init_hw_mlme_ext(_adapter *padapter)
return _SUCCESS;
}
static void init_mlme_ext_priv_value(_adapter* padapter)
static void init_mlme_ext_priv_value(struct adapter* padapter)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -290,7 +290,7 @@ static int has_channel(struct rt_channel_info *channel_set,
return 0;
}
static void init_channel_list(_adapter *padapter, struct rt_channel_info *channel_set,
static void init_channel_list(struct adapter *padapter, struct rt_channel_info *channel_set,
u8 chanset_size,
struct p2p_channels *channel_list) {
@ -342,7 +342,7 @@ static void init_channel_list(_adapter *padapter, struct rt_channel_info *channe
}
static u8 init_channel_set(_adapter* padapter, u8 ChannelPlan, struct rt_channel_info *channel_set)
static u8 init_channel_set(struct adapter* padapter, u8 ChannelPlan, struct rt_channel_info *channel_set)
{
u8 index,chanset_size = 0;
u8 b5GBand = false, b2_4GBand = false;
@ -397,7 +397,7 @@ static u8 init_channel_set(_adapter* padapter, u8 ChannelPlan, struct rt_channel
return chanset_size;
}
int init_mlme_ext_priv(_adapter* padapter)
int init_mlme_ext_priv(struct adapter* padapter)
{
int res = _SUCCESS;
struct registry_priv* pregistrypriv = &padapter->registrypriv;
@ -435,7 +435,7 @@ int init_mlme_ext_priv(_adapter* padapter)
void free_mlme_ext_priv (struct mlme_ext_priv *pmlmeext)
{
_adapter *padapter = pmlmeext->padapter;
struct adapter *padapter = pmlmeext->padapter;
if (!padapter)
return;
@ -448,7 +448,7 @@ void free_mlme_ext_priv (struct mlme_ext_priv *pmlmeext)
}
}
static u8 cmp_pkt_chnl_diff(_adapter *padapter,u8* pframe,uint packet_len)
static u8 cmp_pkt_chnl_diff(struct adapter *padapter,u8* pframe,uint packet_len)
{ /* if the channel is same, return 0. else return channel differential */
uint len;
u8 channel;
@ -472,7 +472,7 @@ static u8 cmp_pkt_chnl_diff(_adapter *padapter,u8* pframe,uint packet_len)
}
}
static void _mgt_dispatcher(_adapter *padapter, struct mlme_handler *ptable, union recv_frame *precv_frame)
static void _mgt_dispatcher(struct adapter *padapter, struct mlme_handler *ptable, union recv_frame *precv_frame)
{
u8 bc_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff};
u8 *pframe = precv_frame->u.hdr.rx_data;
@ -491,7 +491,7 @@ static void _mgt_dispatcher(_adapter *padapter, struct mlme_handler *ptable, uni
}
void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame)
void mgt_dispatcher(struct adapter *padapter, union recv_frame *precv_frame)
{
int index;
struct mlme_handler *ptable;
@ -582,7 +582,7 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame)
}
#ifdef CONFIG_P2P
static u32 p2p_listen_state_process(_adapter *padapter, unsigned char *da)
static u32 p2p_listen_state_process(struct adapter *padapter, unsigned char *da)
{
bool response = true;
@ -606,7 +606,7 @@ Following are the callback functions for each subtype of the management frames
*****************************************************************************/
unsigned int OnProbeReq(_adapter *padapter, union recv_frame *precv_frame)
unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame)
{
unsigned int ielen;
unsigned char *p;
@ -695,7 +695,7 @@ _issue_probersp:
return _SUCCESS;
}
unsigned int OnProbeRsp(_adapter *padapter, union recv_frame *precv_frame)
unsigned int OnProbeRsp(struct adapter *padapter, union recv_frame *precv_frame)
{
struct sta_info *psta;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -769,7 +769,7 @@ unsigned int OnProbeRsp(_adapter *padapter, union recv_frame *precv_frame)
return _SUCCESS;
}
unsigned int OnBeacon(_adapter *padapter, union recv_frame *precv_frame)
unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame)
{
int cam_idx;
struct sta_info *psta;
@ -861,7 +861,7 @@ _END_ONBEACON_:
}
unsigned int OnAuth(_adapter *padapter, union recv_frame *precv_frame)
unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)
{
#ifdef CONFIG_AP_MODE
unsigned long irqL;
@ -1046,7 +1046,7 @@ auth_fail:
}
unsigned int OnAuthClient(_adapter *padapter, union recv_frame *precv_frame)
unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_frame)
{
unsigned int seq, len, status, offset;
unsigned char *p;
@ -1145,7 +1145,7 @@ authclnt_fail:
}
unsigned int OnAssocReq(_adapter *padapter, union recv_frame *precv_frame)
unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
{
#ifdef CONFIG_AP_MODE
unsigned long irqL;
@ -1685,7 +1685,7 @@ OnAssocReqFail:
}
unsigned int OnAssocRsp(_adapter *padapter, union recv_frame *precv_frame)
unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_frame)
{
uint i;
int res;
@ -1775,7 +1775,7 @@ report_assoc_result:
return _SUCCESS;
}
unsigned int OnDeAuth(_adapter *padapter, union recv_frame *precv_frame)
unsigned int OnDeAuth(struct adapter *padapter, union recv_frame *precv_frame)
{
unsigned short reason;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -1850,7 +1850,7 @@ unsigned int OnDeAuth(_adapter *padapter, union recv_frame *precv_frame)
}
unsigned int OnDisassoc(_adapter *padapter, union recv_frame *precv_frame)
unsigned int OnDisassoc(struct adapter *padapter, union recv_frame *precv_frame)
{
u16 reason;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -1924,13 +1924,13 @@ unsigned int OnDisassoc(_adapter *padapter, union recv_frame *precv_frame)
}
unsigned int OnAtim(_adapter *padapter, union recv_frame *precv_frame)
unsigned int OnAtim(struct adapter *padapter, union recv_frame *precv_frame)
{
DBG_88E("%s\n", __func__);
return _SUCCESS;
}
static unsigned int on_action_spct_ch_switch (_adapter *padapter, struct sta_info *psta, u8 *ies, uint ies_len)
static unsigned int on_action_spct_ch_switch (struct adapter *padapter, struct sta_info *psta, u8 *ies, uint ies_len)
{
unsigned int ret = _FAIL;
struct mlme_ext_priv *mlmeext = &padapter->mlmeextpriv;
@ -1988,7 +1988,7 @@ exit:
return ret;
}
unsigned int on_action_spct(_adapter *padapter, union recv_frame *precv_frame)
unsigned int on_action_spct(struct adapter *padapter, union recv_frame *precv_frame)
{
unsigned int ret = _FAIL;
struct sta_info *psta = NULL;
@ -2027,17 +2027,17 @@ exit:
return ret;
}
unsigned int OnAction_qos(_adapter *padapter, union recv_frame *precv_frame)
unsigned int OnAction_qos(struct adapter *padapter, union recv_frame *precv_frame)
{
return _SUCCESS;
}
unsigned int OnAction_dls(_adapter *padapter, union recv_frame *precv_frame)
unsigned int OnAction_dls(struct adapter *padapter, union recv_frame *precv_frame)
{
return _SUCCESS;
}
unsigned int OnAction_back(_adapter *padapter, union recv_frame *precv_frame)
unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_frame)
{
u8 *addr;
struct sta_info *psta=NULL;
@ -2184,7 +2184,7 @@ static void get_channel_cnt_24g_5gl_5gh( struct mlme_ext_priv *pmlmeext, u8* p2
}
}
void issue_p2p_GO_request(_adapter *padapter, u8* raddr)
void issue_p2p_GO_request(struct adapter *padapter, u8* raddr)
{
unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
@ -2556,7 +2556,7 @@ void issue_p2p_GO_request(_adapter *padapter, u8* raddr)
return;
}
static void issue_p2p_GO_response(_adapter *padapter, u8* raddr, u8* frame_body,uint len, u8 result)
static void issue_p2p_GO_response(struct adapter *padapter, u8* raddr, u8* frame_body,uint len, u8 result)
{
unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
@ -2965,7 +2965,7 @@ static void issue_p2p_GO_response(_adapter *padapter, u8* raddr, u8* frame_body,
return;
}
static void issue_p2p_GO_confirm(_adapter *padapter, u8* raddr, u8 result)
static void issue_p2p_GO_confirm(struct adapter *padapter, u8* raddr, u8 result)
{
unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
@ -3176,7 +3176,7 @@ static void issue_p2p_GO_confirm(_adapter *padapter, u8* raddr, u8 result)
}
void issue_p2p_invitation_request(_adapter *padapter, u8* raddr )
void issue_p2p_invitation_request(struct adapter *padapter, u8* raddr )
{
unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
@ -3441,7 +3441,7 @@ void issue_p2p_invitation_request(_adapter *padapter, u8* raddr )
}
void issue_p2p_invitation_response(_adapter *padapter, u8* raddr, u8 dialogToken, u8 status_code)
void issue_p2p_invitation_response(struct adapter *padapter, u8* raddr, u8 dialogToken, u8 status_code)
{
unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
@ -3642,7 +3642,7 @@ void issue_p2p_invitation_response(_adapter *padapter, u8* raddr, u8 dialogToken
return;
}
void issue_p2p_provision_request(_adapter *padapter, u8* pssid, u8 ussidlen, u8* pdev_raddr )
void issue_p2p_provision_request(struct adapter *padapter, u8* pssid, u8 ussidlen, u8* pdev_raddr )
{
unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION;
@ -3764,7 +3764,7 @@ static u8 is_matched_in_profilelist( u8* peermacaddr, struct profile_info* profi
return (match_result );
}
void issue_probersp_p2p(_adapter *padapter, unsigned char *da)
void issue_probersp_p2p(struct adapter *padapter, unsigned char *da)
{
struct xmit_frame *pmgntframe;
struct pkt_attrib *pattrib;
@ -4019,7 +4019,7 @@ void issue_probersp_p2p(_adapter *padapter, unsigned char *da)
return;
}
static int _issue_probereq_p2p(_adapter *padapter, u8 *da, int wait_ack)
static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack)
{
int ret = _FAIL;
struct xmit_frame *pmgntframe;
@ -4323,12 +4323,12 @@ exit:
return ret;
}
inline void issue_probereq_p2p(_adapter *adapter, u8 *da)
inline void issue_probereq_p2p(struct adapter *adapter, u8 *da)
{
_issue_probereq_p2p(adapter, da, false);
}
int issue_probereq_p2p_ex(_adapter *adapter, u8 *da, int try_cnt, int wait_ms)
int issue_probereq_p2p_ex(struct adapter *adapter, u8 *da, int try_cnt, int wait_ms)
{
int ret;
int i = 0;
@ -4373,7 +4373,7 @@ exit:
static s32 rtw_action_public_decache(union recv_frame *recv_frame, s32 token)
{
_adapter *adapter = recv_frame->u.hdr.adapter;
struct adapter *adapter = recv_frame->u.hdr.adapter;
struct mlme_ext_priv *mlmeext = &(adapter->mlmeextpriv);
u8 *frame = recv_frame->u.hdr.rx_data;
u16 seq_ctrl = ( (recv_frame->u.hdr.attrib.seq_num&0xffff) << 4) |
@ -4407,7 +4407,7 @@ static s32 rtw_action_public_decache(union recv_frame *recv_frame, s32 token)
static unsigned int on_action_public_p2p(union recv_frame *precv_frame)
{
_adapter *padapter = precv_frame->u.hdr.adapter;
struct adapter *padapter = precv_frame->u.hdr.adapter;
u8 *pframe = precv_frame->u.hdr.rx_data;
uint len = precv_frame->u.hdr.len;
u8 *frame_body;
@ -4791,7 +4791,7 @@ static unsigned int on_action_public_default(union recv_frame *precv_frame, u8 a
uint frame_len = precv_frame->u.hdr.len;
u8 *frame_body = pframe + sizeof(struct rtw_ieee80211_hdr_3addr);
u8 token;
_adapter *adapter = precv_frame->u.hdr.adapter;
struct adapter *adapter = precv_frame->u.hdr.adapter;
int cnt = 0;
char msg[64];
@ -4806,7 +4806,7 @@ exit:
return ret;
}
unsigned int on_action_public(_adapter *padapter, union recv_frame *precv_frame)
unsigned int on_action_public(struct adapter *padapter, union recv_frame *precv_frame)
{
unsigned int ret = _FAIL;
u8 *pframe = precv_frame->u.hdr.rx_data;
@ -4836,17 +4836,17 @@ exit:
return ret;
}
unsigned int OnAction_ht(_adapter *padapter, union recv_frame *precv_frame)
unsigned int OnAction_ht(struct adapter *padapter, union recv_frame *precv_frame)
{
return _SUCCESS;
}
unsigned int OnAction_wmm(_adapter *padapter, union recv_frame *precv_frame)
unsigned int OnAction_wmm(struct adapter *padapter, union recv_frame *precv_frame)
{
return _SUCCESS;
}
unsigned int OnAction_p2p(_adapter *padapter, union recv_frame *precv_frame)
unsigned int OnAction_p2p(struct adapter *padapter, union recv_frame *precv_frame)
{
#ifdef CONFIG_P2P
u8 *frame_body;
@ -4891,7 +4891,7 @@ unsigned int OnAction_p2p(_adapter *padapter, union recv_frame *precv_frame)
return _SUCCESS;
}
unsigned int OnAction(_adapter *padapter, union recv_frame *precv_frame)
unsigned int OnAction(struct adapter *padapter, union recv_frame *precv_frame)
{
int i;
unsigned char category;
@ -4916,7 +4916,7 @@ unsigned int OnAction(_adapter *padapter, union recv_frame *precv_frame)
}
unsigned int DoReserved(_adapter *padapter, union recv_frame *precv_frame)
unsigned int DoReserved(struct adapter *padapter, union recv_frame *precv_frame)
{
/* DBG_88E("rcvd mgt frame(%x, %x)\n", (GetFrameSubType(pframe) >> 4), *(unsigned int *)GetAddr1Ptr(pframe)); */
@ -4960,7 +4960,7 @@ Following are some TX fuctions for WiFi MLME
*****************************************************************************/
void update_mgnt_tx_rate(_adapter *padapter, u8 rate)
void update_mgnt_tx_rate(struct adapter *padapter, u8 rate)
{
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@ -4968,7 +4968,7 @@ void update_mgnt_tx_rate(_adapter *padapter, u8 rate)
DBG_88E("%s(): rate = %x\n",__func__, rate);
}
void update_mgntframe_attrib(_adapter *padapter, struct pkt_attrib *pattrib)
void update_mgntframe_attrib(struct adapter *padapter, struct pkt_attrib *pattrib)
{
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@ -5002,7 +5002,7 @@ void update_mgntframe_attrib(_adapter *padapter, struct pkt_attrib *pattrib)
}
void dump_mgntframe(_adapter *padapter, struct xmit_frame *pmgntframe)
void dump_mgntframe(struct adapter *padapter, struct xmit_frame *pmgntframe)
{
if (padapter->bSurpriseRemoved == true ||
padapter->bDriverStopped == true)
@ -5011,7 +5011,7 @@ void dump_mgntframe(_adapter *padapter, struct xmit_frame *pmgntframe)
rtw_hal_mgnt_xmit(padapter, pmgntframe);
}
s32 dump_mgntframe_and_wait(_adapter *padapter, struct xmit_frame *pmgntframe, int timeout_ms)
s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntframe, int timeout_ms)
{
s32 ret = _FAIL;
struct xmit_buf *pxmitbuf = pmgntframe->pxmitbuf;
@ -5032,7 +5032,7 @@ s32 dump_mgntframe_and_wait(_adapter *padapter, struct xmit_frame *pmgntframe, i
return ret;
}
s32 dump_mgntframe_and_wait_ack(_adapter *padapter, struct xmit_frame *pmgntframe)
s32 dump_mgntframe_and_wait_ack(struct adapter *padapter, struct xmit_frame *pmgntframe)
{
s32 ret = _FAIL;
u32 timeout_ms = 500;/* 500ms */
@ -5094,7 +5094,7 @@ static int update_hidden_ssid(u8 *ies, u32 ies_len, u8 hidden_ssid_mode)
return len_diff;
}
void issue_beacon(_adapter *padapter, int timeout_ms)
void issue_beacon(struct adapter *padapter, int timeout_ms)
{
struct xmit_frame *pmgntframe;
struct pkt_attrib *pattrib;
@ -5348,7 +5348,7 @@ _issue_bcn:
}
void issue_probersp(_adapter *padapter, unsigned char *da, u8 is_valid_p2p_probereq)
void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p_probereq)
{
struct xmit_frame *pmgntframe;
struct pkt_attrib *pattrib;
@ -5531,7 +5531,7 @@ void issue_probersp(_adapter *padapter, unsigned char *da, u8 is_valid_p2p_probe
return;
}
static int _issue_probereq(_adapter *padapter, struct 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;
@ -5632,12 +5632,12 @@ exit:
return ret;
}
inline void issue_probereq(_adapter *padapter, struct 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(_adapter *padapter, struct 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;
@ -5680,7 +5680,7 @@ exit:
}
/* if psta == NULL, indiate we are station(client) now... */
void issue_auth(_adapter *padapter, struct sta_info *psta, unsigned short status)
void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short status)
{
struct xmit_frame *pmgntframe;
struct pkt_attrib *pattrib;
@ -5822,7 +5822,7 @@ void issue_auth(_adapter *padapter, struct sta_info *psta, unsigned short status
}
void issue_asocrsp(_adapter *padapter, unsigned short status, struct sta_info *pstat, int pkt_type)
void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_info *pstat, int pkt_type)
{
#ifdef CONFIG_AP_MODE
struct xmit_frame *pmgntframe;
@ -5965,7 +5965,7 @@ void issue_asocrsp(_adapter *padapter, unsigned short status, struct sta_info *p
#endif
}
void issue_assocreq(_adapter *padapter)
void issue_assocreq(struct adapter *padapter)
{
int ret = _FAIL;
struct xmit_frame *pmgntframe;
@ -6325,7 +6325,7 @@ exit:
}
/* when wait_ack is ture, this function shoule be called at process context */
static int _issue_nulldata(_adapter *padapter, unsigned char *da, unsigned int power_mode, int wait_ack)
static int _issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int power_mode, int wait_ack)
{
int ret = _FAIL;
struct xmit_frame *pmgntframe;
@ -6408,7 +6408,7 @@ exit:
/* when wait_ms >0 , this function shoule be called at process context */
/* da == NULL for station mode */
int issue_nulldata(_adapter *padapter, unsigned char *da, unsigned int power_mode, int try_cnt, int wait_ms)
int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int power_mode, int try_cnt, int wait_ms)
{
int ret;
int i = 0;
@ -6456,7 +6456,7 @@ exit:
}
/* when wait_ack is ture, this function shoule be called at process context */
static int _issue_qos_nulldata(_adapter *padapter, unsigned char *da, u16 tid, int wait_ack)
static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int wait_ack)
{
int ret = _FAIL;
struct xmit_frame *pmgntframe;
@ -6542,7 +6542,7 @@ exit:
/* when wait_ms >0 , this function shoule be called at process context */
/* da == NULL for station mode */
int issue_qos_nulldata(_adapter *padapter, unsigned char *da, u16 tid, int try_cnt, int wait_ms)
int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int try_cnt, int wait_ms)
{
int ret;
int i = 0;
@ -6589,7 +6589,7 @@ exit:
return ret;
}
static int _issue_deauth(_adapter *padapter, unsigned char *da, unsigned short reason, u8 wait_ack)
static int _issue_deauth(struct adapter *padapter, unsigned char *da, unsigned short reason, u8 wait_ack)
{
struct xmit_frame *pmgntframe;
struct pkt_attrib *pattrib;
@ -6657,13 +6657,13 @@ exit:
return ret;
}
int issue_deauth(_adapter *padapter, unsigned char *da, unsigned short reason)
int issue_deauth(struct adapter *padapter, unsigned char *da, unsigned short reason)
{
DBG_88E("%s to %pM\n", __func__, da);
return _issue_deauth(padapter, da, reason, false);
}
int issue_deauth_ex(_adapter *padapter, u8 *da, unsigned short reason, int try_cnt,
int issue_deauth_ex(struct adapter *padapter, u8 *da, unsigned short reason, int try_cnt,
int wait_ms)
{
int ret;
@ -6705,7 +6705,7 @@ exit:
return ret;
}
void issue_action_spct_ch_switch (_adapter *padapter, u8 *ra, u8 new_ch, u8 ch_offset)
void issue_action_spct_ch_switch (struct adapter *padapter, u8 *ra, u8 new_ch, u8 ch_offset)
{
unsigned long irqL;
struct list_head *plist, *phead;
@ -6769,7 +6769,7 @@ void issue_action_spct_ch_switch (_adapter *padapter, u8 *ra, u8 new_ch, u8 ch_o
}
void issue_action_BA(_adapter *padapter, unsigned char *raddr, unsigned char action, unsigned short status)
void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned char action, unsigned short status)
{
u8 category = RTW_WLAN_CATEGORY_BACK;
u16 start_seq;
@ -6929,7 +6929,7 @@ void issue_action_BA(_adapter *padapter, unsigned char *raddr, unsigned char act
#endif /* CONFIG_80211N_HT */
}
static void issue_action_BSSCoexistPacket(_adapter *padapter)
static void issue_action_BSSCoexistPacket(struct adapter *padapter)
{
unsigned long irqL;
struct list_head *plist, *phead;
@ -7087,7 +7087,7 @@ static void issue_action_BSSCoexistPacket(_adapter *padapter)
#endif /* CONFIG_80211N_HT */
}
unsigned int send_delba(_adapter *padapter, u8 initiator, u8 *addr)
unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr)
{
struct sta_priv *pstapriv = &padapter->stapriv;
struct sta_info *psta = NULL;
@ -7141,7 +7141,7 @@ unsigned int send_delba(_adapter *padapter, u8 initiator, u8 *addr)
}
unsigned int send_beacon(_adapter *padapter)
unsigned int send_beacon(struct adapter *padapter)
{
u8 bxmitok = false;
int issue=0;
@ -7181,7 +7181,7 @@ Following are some utitity fuctions for WiFi MLME
*****************************************************************************/
bool IsLegal5GChannel(PADAPTER Adapter, u8 channel)
bool IsLegal5GChannel(struct adapter * Adapter, u8 channel)
{
int i=0;
u8 Channel_5G[45] = {36,38,40,42,44,46,48,50,52,54,56,58,
@ -7194,7 +7194,7 @@ bool IsLegal5GChannel(PADAPTER Adapter, u8 channel)
return false;
}
void site_survey(_adapter *padapter)
void site_survey(struct adapter *padapter)
{
unsigned char survey_channel = 0, val8;
enum rt_scan_type ScanType = SCAN_PASSIVE;
@ -7397,7 +7397,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, struct wlan_bssid_ex *bssid)
u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, struct wlan_bssid_ex *bssid)
{
int i;
u32 len;
@ -7591,7 +7591,7 @@ u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, struct wl
return _SUCCESS;
}
void start_create_ibss(_adapter* padapter)
void start_create_ibss(struct adapter* padapter)
{
unsigned short caps;
u8 val8;
@ -7649,7 +7649,7 @@ void start_create_ibss(_adapter* padapter)
}
void start_clnt_join(_adapter* padapter)
void start_clnt_join(struct adapter* padapter)
{
unsigned short caps;
u8 val8;
@ -7711,7 +7711,7 @@ void start_clnt_join(_adapter* padapter)
}
void start_clnt_auth(_adapter* padapter)
void start_clnt_auth(struct adapter* padapter)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -7743,7 +7743,7 @@ void start_clnt_auth(_adapter* padapter)
}
void start_clnt_assoc(_adapter* padapter)
void start_clnt_assoc(struct adapter* padapter)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -7758,7 +7758,7 @@ void start_clnt_assoc(_adapter* padapter)
set_link_timer(pmlmeext, REASSOC_TO);
}
unsigned int receive_disconnect(_adapter *padapter, unsigned char *MacAddr, unsigned short reason)
unsigned int receive_disconnect(struct adapter *padapter, unsigned char *MacAddr, unsigned short reason)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -7786,7 +7786,7 @@ unsigned int receive_disconnect(_adapter *padapter, unsigned char *MacAddr, unsi
return _SUCCESS;
}
static void process_80211d(PADAPTER padapter, struct wlan_bssid_ex *bssid)
static void process_80211d(struct adapter * padapter, struct wlan_bssid_ex *bssid)
{
struct registry_priv *pregistrypriv;
struct mlme_ext_priv *pmlmeext;
@ -8025,7 +8025,7 @@ Following are the functions to report events
*****************************************************************************/
void report_survey_event(_adapter *padapter, union recv_frame *precv_frame)
void report_survey_event(struct adapter *padapter, union recv_frame *precv_frame)
{
struct cmd_obj *pcmd_obj;
u8 *pevtcmd;
@ -8088,7 +8088,7 @@ void report_survey_event(_adapter *padapter, union recv_frame *precv_frame)
return;
}
void report_surveydone_event(_adapter *padapter)
void report_surveydone_event(struct adapter *padapter)
{
struct cmd_obj *pcmd_obj;
u8 *pevtcmd;
@ -8132,7 +8132,7 @@ void report_surveydone_event(_adapter *padapter)
}
void report_join_res(_adapter *padapter, int res)
void report_join_res(struct adapter *padapter, int res)
{
struct cmd_obj *pcmd_obj;
u8 *pevtcmd;
@ -8185,7 +8185,7 @@ void report_join_res(_adapter *padapter, int res)
}
void report_del_sta_event(_adapter *padapter, unsigned char* MacAddr, unsigned short reason)
void report_del_sta_event(struct adapter *padapter, unsigned char* MacAddr, unsigned short reason)
{
struct cmd_obj *pcmd_obj;
u8 *pevtcmd;
@ -8243,7 +8243,7 @@ void report_del_sta_event(_adapter *padapter, unsigned char* MacAddr, unsigned s
return;
}
void report_add_sta_event(_adapter *padapter, unsigned char* MacAddr, int cam_idx)
void report_add_sta_event(struct adapter *padapter, unsigned char* MacAddr, int cam_idx)
{
struct cmd_obj *pcmd_obj;
u8 *pevtcmd;
@ -8298,7 +8298,7 @@ Following are the event callback functions
*****************************************************************************/
/* for sta/adhoc mode */
void update_sta_info(_adapter *padapter, struct sta_info *psta)
void update_sta_info(struct adapter *padapter, struct sta_info *psta)
{
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -8351,7 +8351,7 @@ void update_sta_info(_adapter *padapter, struct sta_info *psta)
}
void mlmeext_joinbss_event_callback(_adapter *padapter, int join_res)
void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)
{
struct sta_info *psta, *psta_bmc;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -8443,7 +8443,7 @@ exit_mlmeext_joinbss_event_callback:
}
void mlmeext_sta_add_event_callback(_adapter *padapter, struct sta_info *psta)
void mlmeext_sta_add_event_callback(struct adapter *padapter, struct sta_info *psta)
{
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -8493,7 +8493,7 @@ void mlmeext_sta_add_event_callback(_adapter *padapter, struct sta_info *psta)
}
void mlmeext_sta_del_event_callback(_adapter *padapter)
void mlmeext_sta_del_event_callback(struct adapter *padapter)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -8534,8 +8534,8 @@ void mlmeext_sta_del_event_callback(_adapter *padapter)
Following are the functions for the timer handlers
*****************************************************************************/
void _linked_rx_signal_strehgth_display(_adapter *padapter);
void _linked_rx_signal_strehgth_display(_adapter *padapter)
void _linked_rx_signal_strehgth_display(struct adapter *padapter);
void _linked_rx_signal_strehgth_display(struct adapter *padapter)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -8557,7 +8557,7 @@ void _linked_rx_signal_strehgth_display(_adapter *padapter)
}
static u8 chk_ap_is_alive(_adapter *padapter, struct sta_info *psta)
static u8 chk_ap_is_alive(struct adapter *padapter, struct sta_info *psta)
{
u8 ret = false;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -8576,7 +8576,7 @@ static u8 chk_ap_is_alive(_adapter *padapter, struct sta_info *psta)
return ret;
}
void linked_status_chk(_adapter *padapter)
void linked_status_chk(struct adapter *padapter)
{
u32 i;
struct sta_info *psta;
@ -8710,7 +8710,7 @@ void linked_status_chk(_adapter *padapter)
}
void survey_timer_hdl(_adapter *padapter)
void survey_timer_hdl(struct adapter *padapter)
{
struct cmd_obj *ph2c;
struct sitesurvey_parm *psurveyPara;
@ -8770,7 +8770,7 @@ exit_survey_timer_hdl:
return;
}
void link_timer_hdl(_adapter *padapter)
void link_timer_hdl(struct adapter *padapter)
{
/* static unsigned int rx_pkt = 0; */
/* static u64 tx_cnt = 0; */
@ -8844,12 +8844,12 @@ void addba_timer_hdl(struct sta_info *psta)
#endif /* CONFIG_80211N_HT */
}
u8 NULL_hdl(_adapter *padapter, u8 *pbuf)
u8 NULL_hdl(struct adapter *padapter, u8 *pbuf)
{
return H2C_SUCCESS;
}
u8 setopmode_hdl(_adapter *padapter, u8 *pbuf)
u8 setopmode_hdl(struct adapter *padapter, u8 *pbuf)
{
u8 type;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -8883,7 +8883,7 @@ u8 setopmode_hdl(_adapter *padapter, u8 *pbuf)
}
u8 createbss_hdl(_adapter *padapter, u8 *pbuf)
u8 createbss_hdl(struct adapter *padapter, u8 *pbuf)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -8949,7 +8949,7 @@ u8 createbss_hdl(_adapter *padapter, u8 *pbuf)
}
u8 join_cmd_hdl(_adapter *padapter, u8 *pbuf)
u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf)
{
u8 join_type;
struct ndis_802_11_var_ie * pIE;
@ -9079,7 +9079,7 @@ u8 join_cmd_hdl(_adapter *padapter, u8 *pbuf)
}
u8 disconnect_hdl(_adapter *padapter, unsigned char *pbuf)
u8 disconnect_hdl(struct adapter *padapter, unsigned char *pbuf)
{
struct disconnect_parm *param = (struct disconnect_parm *)pbuf;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -9126,7 +9126,7 @@ u8 disconnect_hdl(_adapter *padapter, unsigned char *pbuf)
return H2C_SUCCESS;
}
static int rtw_scan_ch_decision(_adapter *padapter, struct rtw_ieee80211_channel *out,
static int rtw_scan_ch_decision(struct adapter *padapter, struct rtw_ieee80211_channel *out,
u32 out_num, struct rtw_ieee80211_channel *in, u32 in_num)
{
int i, j;
@ -9171,7 +9171,7 @@ static int rtw_scan_ch_decision(_adapter *padapter, struct rtw_ieee80211_channel
return j;
}
u8 sitesurvey_cmd_hdl(_adapter *padapter, u8 *pbuf)
u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 *pbuf)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct sitesurvey_parm *pparm = (struct sitesurvey_parm *)pbuf;
@ -9259,7 +9259,7 @@ u8 sitesurvey_cmd_hdl(_adapter *padapter, u8 *pbuf)
}
u8 setauth_hdl(_adapter *padapter, unsigned char *pbuf)
u8 setauth_hdl(struct adapter *padapter, unsigned char *pbuf)
{
struct setauth_parm *pparm = (struct setauth_parm *)pbuf;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -9273,7 +9273,7 @@ u8 setauth_hdl(_adapter *padapter, unsigned char *pbuf)
return H2C_SUCCESS;
}
u8 setkey_hdl(_adapter *padapter, u8 *pbuf)
u8 setkey_hdl(struct adapter *padapter, u8 *pbuf)
{
unsigned short ctrl;
struct setkey_parm *pparm = (struct setkey_parm *)pbuf;
@ -9295,7 +9295,7 @@ u8 setkey_hdl(_adapter *padapter, u8 *pbuf)
return H2C_SUCCESS;
}
u8 set_stakey_hdl(_adapter *padapter, u8 *pbuf)
u8 set_stakey_hdl(struct adapter *padapter, u8 *pbuf)
{
u16 ctrl=0;
u8 cam_id;/* cam_entry */
@ -9381,7 +9381,7 @@ u8 set_stakey_hdl(_adapter *padapter, u8 *pbuf)
return H2C_SUCCESS;
}
u8 add_ba_hdl(_adapter *padapter, unsigned char *pbuf)
u8 add_ba_hdl(struct adapter *padapter, unsigned char *pbuf)
{
struct addBaReq_parm *pparm = (struct addBaReq_parm *)pbuf;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -9409,7 +9409,7 @@ u8 add_ba_hdl(_adapter *padapter, unsigned char *pbuf)
return H2C_SUCCESS;
}
u8 set_tx_beacon_cmd(_adapter* padapter)
u8 set_tx_beacon_cmd(struct adapter* padapter)
{
struct cmd_obj *ph2c;
struct Tx_Beacon_param *ptxBeacon_parm;
@ -9455,12 +9455,12 @@ _func_exit_;
return res;
}
u8 mlme_evt_hdl(_adapter *padapter, unsigned char *pbuf)
u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf)
{
u8 evt_code;
u16 evt_sz;
uint *peventbuf;
void (*event_callback)(_adapter *dev, u8 *pbuf);
void (*event_callback)(struct adapter *dev, u8 *pbuf);
struct evt_priv *pevt_priv = &(padapter->evtpriv);
peventbuf = (uint*)pbuf;
@ -9505,7 +9505,7 @@ _abort_event_:
}
u8 h2c_msg_hdl(_adapter *padapter, unsigned char *pbuf)
u8 h2c_msg_hdl(struct adapter *padapter, unsigned char *pbuf)
{
if (!pbuf)
return H2C_PARAMETERS_ERROR;
@ -9513,7 +9513,7 @@ u8 h2c_msg_hdl(_adapter *padapter, unsigned char *pbuf)
return H2C_SUCCESS;
}
u8 tx_beacon_hdl(_adapter *padapter, unsigned char *pbuf)
u8 tx_beacon_hdl(struct adapter *padapter, unsigned char *pbuf)
{
if (send_beacon(padapter)==_FAIL)
{
@ -9577,7 +9577,7 @@ u8 tx_beacon_hdl(_adapter *padapter, unsigned char *pbuf)
return H2C_SUCCESS;
}
u8 set_ch_hdl(_adapter *padapter, u8 *pbuf)
u8 set_ch_hdl(struct adapter *padapter, u8 *pbuf)
{
struct set_ch_parm *set_ch_parm;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -9601,7 +9601,7 @@ u8 set_ch_hdl(_adapter *padapter, u8 *pbuf)
return H2C_SUCCESS;
}
u8 set_chplan_hdl(_adapter *padapter, unsigned char *pbuf)
u8 set_chplan_hdl(struct adapter *padapter, unsigned char *pbuf)
{
struct SetChannelPlan_param *setChannelPlan_param;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -9618,14 +9618,14 @@ u8 set_chplan_hdl(_adapter *padapter, unsigned char *pbuf)
return H2C_SUCCESS;
}
u8 led_blink_hdl(_adapter *padapter, unsigned char *pbuf)
u8 led_blink_hdl(struct adapter *padapter, unsigned char *pbuf)
{
if (!pbuf)
return H2C_PARAMETERS_ERROR;
return H2C_SUCCESS;
}
u8 set_csa_hdl(_adapter *padapter, unsigned char *pbuf)
u8 set_csa_hdl(struct adapter *padapter, unsigned char *pbuf)
{
return H2C_REJECTED;
@ -9644,7 +9644,7 @@ u8 set_csa_hdl(_adapter *padapter, unsigned char *pbuf)
/* TDLS_CKALV_PH1 : check alive timer phase1 */
/* TDLS_CKALV_PH2 : check alive timer phase2 */
/* TDLS_FREE_STA : free tdls sta */
u8 tdls_hdl(_adapter *padapter, unsigned char *pbuf)
u8 tdls_hdl(struct adapter *padapter, unsigned char *pbuf)
{
return H2C_REJECTED;
}

112
core/rtw_mp.c
View file

@ -24,7 +24,7 @@
#include "odm_precomp.h"
#include "rtl8188e_hal.h"
u32 read_macreg(_adapter *padapter, u32 addr, u32 sz)
u32 read_macreg(struct adapter *padapter, u32 addr, u32 sz)
{
u32 val = 0;
@ -46,7 +46,7 @@ u32 read_macreg(_adapter *padapter, u32 addr, u32 sz)
return val;
}
void write_macreg(_adapter *padapter, u32 addr, u32 val, u32 sz)
void write_macreg(struct adapter *padapter, u32 addr, u32 val, u32 sz)
{
switch (sz) {
case 1:
@ -64,32 +64,32 @@ void write_macreg(_adapter *padapter, u32 addr, u32 val, u32 sz)
}
u32 read_bbreg(_adapter *padapter, u32 addr, u32 bitmask)
u32 read_bbreg(struct adapter *padapter, u32 addr, u32 bitmask)
{
return rtw_hal_read_bbreg(padapter, addr, bitmask);
}
void write_bbreg(_adapter *padapter, u32 addr, u32 bitmask, u32 val)
void write_bbreg(struct adapter *padapter, u32 addr, u32 bitmask, u32 val)
{
rtw_hal_write_bbreg(padapter, addr, bitmask, val);
}
u32 _read_rfreg(PADAPTER padapter, u8 rfpath, u32 addr, u32 bitmask)
u32 _read_rfreg(struct adapter * padapter, u8 rfpath, u32 addr, u32 bitmask)
{
return rtw_hal_read_rfreg(padapter, (enum rf_radio_path)rfpath, addr, bitmask);
}
void _write_rfreg(PADAPTER padapter, u8 rfpath, u32 addr, u32 bitmask, u32 val)
void _write_rfreg(struct adapter * padapter, u8 rfpath, u32 addr, u32 bitmask, u32 val)
{
rtw_hal_write_rfreg(padapter, (enum rf_radio_path)rfpath, addr, bitmask, val);
}
u32 read_rfreg(PADAPTER padapter, u8 rfpath, u32 addr)
u32 read_rfreg(struct adapter * padapter, u8 rfpath, u32 addr)
{
return _read_rfreg(padapter, (enum rf_radio_path)rfpath, addr, bRFRegOffsetMask);
}
void write_rfreg(PADAPTER padapter, u8 rfpath, u32 addr, u32 val)
void write_rfreg(struct adapter * padapter, u8 rfpath, u32 addr, u32 val)
{
_write_rfreg(padapter, (enum rf_radio_path)rfpath, addr, bRFRegOffsetMask, val);
}
@ -173,7 +173,7 @@ _exit_init_mp_priv:
return res;
}
static void mp_init_xmit_attrib(struct mp_tx *pmptx, PADAPTER padapter)
static void mp_init_xmit_attrib(struct mp_tx *pmptx, struct adapter * padapter)
{
struct pkt_attrib *pattrib;
struct tx_desc *desc;
@ -197,7 +197,7 @@ static void mp_init_xmit_attrib(struct mp_tx *pmptx, PADAPTER padapter)
pattrib->qos_en = false;
}
s32 init_mp_priv(PADAPTER padapter)
s32 init_mp_priv(struct adapter * padapter)
{
struct mp_priv *pmppriv = &padapter->mppriv;
@ -246,7 +246,7 @@ void free_mp_priv(struct mp_priv *pmp_priv)
s32
MPT_InitializeAdapter(
PADAPTER pAdapter,
struct adapter * pAdapter,
u8 Channel
)
{
@ -300,7 +300,7 @@ MPT_InitializeAdapter(
*
* Overview: Extra DeInitialization for Mass Production Test.
*
* Input: PADAPTER pAdapter
* Input: struct adapter * pAdapter
*
* Output: NONE
*
@ -314,7 +314,7 @@ MPT_InitializeAdapter(
*---------------------------------------------------------------------------*/
void
MPT_DeInitAdapter(
PADAPTER pAdapter
struct adapter * pAdapter
)
{
struct mpt_context * pMptCtx = &pAdapter->mppriv.MptCtx;
@ -322,7 +322,7 @@ MPT_DeInitAdapter(
pMptCtx->bMptDrvUnload = true;
}
static u8 mpt_ProStartTest(PADAPTER padapter)
static u8 mpt_ProStartTest(struct adapter * padapter)
{
struct mpt_context * pMptCtx = &padapter->mppriv.MptCtx;
@ -340,19 +340,19 @@ static u8 mpt_ProStartTest(PADAPTER padapter)
/*
* General use
*/
s32 SetPowerTracking(PADAPTER padapter, u8 enable)
s32 SetPowerTracking(struct adapter * padapter, u8 enable)
{
Hal_SetPowerTracking( padapter, enable );
return 0;
}
void GetPowerTracking(PADAPTER padapter, u8 *enable)
void GetPowerTracking(struct adapter * padapter, u8 *enable)
{
Hal_GetPowerTracking( padapter, enable );
}
static void disable_dm(PADAPTER padapter)
static void disable_dm(struct adapter * padapter)
{
u8 v8;
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
@ -376,7 +376,7 @@ static void disable_dm(PADAPTER padapter)
}
/* This function initializes the DUT to the MP test mode */
s32 mp_start_test(PADAPTER padapter)
s32 mp_start_test(struct adapter * padapter)
{
struct wlan_bssid_ex bssid;
struct sta_info *psta;
@ -491,7 +491,7 @@ end_of_mp_start_test:
}
/* */
/* This function change the DUT from the MP test mode into normal mode */
void mp_stop_test(PADAPTER padapter)
void mp_stop_test(struct adapter * padapter)
{
struct mp_priv *pmppriv = &padapter->mppriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -534,7 +534,7 @@ end_of_mp_stop_test:
*
* Overview: Change RF Setting when we siwthc channel/rate/BW for MP.
*
* Input: PADAPTER pAdapter
* Input: struct adapter * pAdapter
*
* Output: NONE
*
@ -546,19 +546,19 @@ end_of_mp_stop_test:
* 01/09/2009 MHC Add CCK modification for 40MHZ. Suggestion from SD3.
*
*---------------------------------------------------------------------------*/
static void mpt_SwitchRfSetting(PADAPTER pAdapter)
static void mpt_SwitchRfSetting(struct adapter * pAdapter)
{
Hal_mpt_SwitchRfSetting(pAdapter);
}
/*---------------------------hal\rtl8192c\MPT_Phy.c---------------------------*/
/*---------------------------hal\rtl8192c\MPT_HelperFunc.c---------------------------*/
static void MPT_CCKTxPowerAdjust(PADAPTER Adapter, bool bInCH14)
static void MPT_CCKTxPowerAdjust(struct adapter * Adapter, bool bInCH14)
{
Hal_MPT_CCKTxPowerAdjust(Adapter,bInCH14);
}
static void MPT_CCKTxPowerAdjustbyIndex(PADAPTER pAdapter, bool beven)
static void MPT_CCKTxPowerAdjustbyIndex(struct adapter * pAdapter, bool beven)
{
Hal_MPT_CCKTxPowerAdjustbyIndex(pAdapter,beven);
}
@ -571,7 +571,7 @@ static void MPT_CCKTxPowerAdjustbyIndex(PADAPTER pAdapter, bool beven)
* Use H2C command to change channel,
* not only modify rf register, but also other setting need to be done.
*/
void SetChannel(PADAPTER pAdapter)
void SetChannel(struct adapter * pAdapter)
{
Hal_SetChannel(pAdapter);
@ -581,39 +581,39 @@ void SetChannel(PADAPTER pAdapter)
* Notice
* Switch bandwitdth may change center frequency(channel)
*/
void SetBandwidth(PADAPTER pAdapter)
void SetBandwidth(struct adapter * pAdapter)
{
Hal_SetBandwidth(pAdapter);
}
static void SetCCKTxPower(PADAPTER pAdapter, u8 *TxPower)
static void SetCCKTxPower(struct adapter * pAdapter, u8 *TxPower)
{
Hal_SetCCKTxPower(pAdapter,TxPower);
}
static void SetOFDMTxPower(PADAPTER pAdapter, u8 *TxPower)
static void SetOFDMTxPower(struct adapter * pAdapter, u8 *TxPower)
{
Hal_SetOFDMTxPower(pAdapter,TxPower);
}
void SetAntenna(PADAPTER pAdapter)
void SetAntenna(struct adapter * pAdapter)
{
Hal_SetAntenna(pAdapter);
}
void SetAntennaPathPower(PADAPTER pAdapter)
void SetAntennaPathPower(struct adapter * pAdapter)
{
Hal_SetAntennaPathPower(pAdapter);
}
void SetTxPower(PADAPTER pAdapter)
void SetTxPower(struct adapter * pAdapter)
{
Hal_SetTxPower(pAdapter);
}
static void SetTxAGCOffset(PADAPTER pAdapter, u32 ulTxAGCOffset)
static void SetTxAGCOffset(struct adapter * pAdapter, u32 ulTxAGCOffset)
{
u32 TxAGCOffset_B, TxAGCOffset_C, TxAGCOffset_D,tmpAGC;
@ -626,76 +626,76 @@ static void SetTxAGCOffset(PADAPTER pAdapter, u32 ulTxAGCOffset)
(bXBTxAGC|bXCTxAGC|bXDTxAGC), tmpAGC);
}
void SetDataRate(PADAPTER pAdapter)
void SetDataRate(struct adapter * pAdapter)
{
Hal_SetDataRate(pAdapter);
}
void MP_PHY_SetRFPathSwitch(PADAPTER pAdapter ,bool bMain)
void MP_PHY_SetRFPathSwitch(struct adapter * pAdapter ,bool bMain)
{
PHY_SetRFPathSwitch(pAdapter,bMain);
}
s32 SetThermalMeter(PADAPTER pAdapter, u8 target_ther)
s32 SetThermalMeter(struct adapter * pAdapter, u8 target_ther)
{
return Hal_SetThermalMeter( pAdapter, target_ther);
}
static void TriggerRFThermalMeter(PADAPTER pAdapter)
static void TriggerRFThermalMeter(struct adapter * pAdapter)
{
Hal_TriggerRFThermalMeter(pAdapter);
}
static u8 ReadRFThermalMeter(PADAPTER pAdapter)
static u8 ReadRFThermalMeter(struct adapter * pAdapter)
{
return Hal_ReadRFThermalMeter(pAdapter);
}
void GetThermalMeter(PADAPTER pAdapter, u8 *value)
void GetThermalMeter(struct adapter * pAdapter, u8 *value)
{
Hal_GetThermalMeter(pAdapter,value);
}
void SetSingleCarrierTx(PADAPTER pAdapter, u8 bStart)
void SetSingleCarrierTx(struct adapter * pAdapter, u8 bStart)
{
PhySetTxPowerLevel(pAdapter);
Hal_SetSingleCarrierTx(pAdapter,bStart);
}
void SetSingleToneTx(PADAPTER pAdapter, u8 bStart)
void SetSingleToneTx(struct adapter * pAdapter, u8 bStart)
{
PhySetTxPowerLevel(pAdapter);
Hal_SetSingleToneTx(pAdapter,bStart);
}
void SetCarrierSuppressionTx(PADAPTER pAdapter, u8 bStart)
void SetCarrierSuppressionTx(struct adapter * pAdapter, u8 bStart)
{
PhySetTxPowerLevel(pAdapter);
Hal_SetCarrierSuppressionTx(pAdapter, bStart);
}
static void SetCCKContinuousTx(PADAPTER pAdapter, u8 bStart)
static void SetCCKContinuousTx(struct adapter * pAdapter, u8 bStart)
{
PhySetTxPowerLevel(pAdapter);
Hal_SetCCKContinuousTx(pAdapter,bStart);
}
static void SetOFDMContinuousTx(PADAPTER pAdapter, u8 bStart)
static void SetOFDMContinuousTx(struct adapter * pAdapter, u8 bStart)
{
PhySetTxPowerLevel(pAdapter);
Hal_SetOFDMContinuousTx( pAdapter, bStart);
}/* mpt_StartOfdmContTx */
void SetContinuousTx(PADAPTER pAdapter, u8 bStart)
void SetContinuousTx(struct adapter * pAdapter, u8 bStart)
{
PhySetTxPowerLevel(pAdapter);
Hal_SetContinuousTx(pAdapter,bStart);
}
void PhySetTxPowerLevel(PADAPTER pAdapter)
void PhySetTxPowerLevel(struct adapter * pAdapter)
{
struct mp_priv *pmp_priv = &pAdapter->mppriv;
@ -704,7 +704,7 @@ void PhySetTxPowerLevel(PADAPTER pAdapter)
}
/* */
static void dump_mpframe(PADAPTER padapter, struct xmit_frame *pmpframe)
static void dump_mpframe(struct adapter * padapter, struct xmit_frame *pmpframe)
{
rtw_hal_mgnt_xmit(padapter, pmpframe);
}
@ -743,7 +743,7 @@ static int mp_xmit_packet_thread(void *context)
struct mp_tx *pmptx;
struct mp_priv *pmp_priv;
struct xmit_priv *pxmitpriv;
PADAPTER padapter;
struct adapter * padapter;
pmp_priv = (struct mp_priv *)context;
pmptx = &pmp_priv->tx;
@ -795,13 +795,13 @@ exit:
thread_exit();
}
void fill_txdesc_for_mp(PADAPTER padapter, struct tx_desc *ptxdesc)
void fill_txdesc_for_mp(struct adapter * padapter, struct tx_desc *ptxdesc)
{
struct mp_priv *pmp_priv = &padapter->mppriv;
_rtw_memcpy(ptxdesc, &(pmp_priv->tx.desc), TXDESC_SIZE);
}
void SetPacketTx(PADAPTER padapter)
void SetPacketTx(struct adapter * padapter)
{
u8 *ptr, *pkt_start, *pkt_end;
u32 pkt_size,offset;
@ -931,7 +931,7 @@ void SetPacketTx(PADAPTER padapter)
DBG_88E("Create PktTx Thread Fail !!!!!\n");
}
void SetPacketRx(PADAPTER pAdapter, u8 bStartRx)
void SetPacketRx(struct adapter * pAdapter, u8 bStartRx)
{
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
@ -950,7 +950,7 @@ void SetPacketRx(PADAPTER pAdapter, u8 bStartRx)
}
}
void ResetPhyRxPktCount(PADAPTER pAdapter)
void ResetPhyRxPktCount(struct adapter * pAdapter)
{
u32 i, phyrx_set = 0;
@ -962,7 +962,7 @@ void ResetPhyRxPktCount(PADAPTER pAdapter)
}
}
static u32 GetPhyRxPktCounts(PADAPTER pAdapter, u32 selbit)
static u32 GetPhyRxPktCounts(struct adapter * pAdapter, u32 selbit)
{
/* selection */
u32 phyrx_set = 0, count = 0;
@ -976,7 +976,7 @@ static u32 GetPhyRxPktCounts(PADAPTER pAdapter, u32 selbit)
return count;
}
u32 GetPhyRxPktReceived(PADAPTER pAdapter)
u32 GetPhyRxPktReceived(struct adapter * pAdapter)
{
u32 OFDM_cnt = 0, CCK_cnt = 0, HT_cnt = 0;
@ -987,7 +987,7 @@ u32 GetPhyRxPktReceived(PADAPTER pAdapter)
return OFDM_cnt + CCK_cnt + HT_cnt;
}
u32 GetPhyRxPktCRC32Error(PADAPTER pAdapter)
u32 GetPhyRxPktCRC32Error(struct adapter * pAdapter)
{
u32 OFDM_cnt = 0, CCK_cnt = 0, HT_cnt = 0;
@ -1001,7 +1001,7 @@ u32 GetPhyRxPktCRC32Error(PADAPTER pAdapter)
/* reg 0x808[9:0]: FFT data x */
/* reg 0x808[22]: 0 --> 1 to get 1 FFT data y */
/* reg 0x8B4[15:0]: FFT data y report */
static u32 rtw_GetPSDData(PADAPTER pAdapter, u32 point)
static u32 rtw_GetPSDData(struct adapter * pAdapter, u32 point)
{
int psd_val;
@ -1031,7 +1031,7 @@ static u32 rtw_GetPSDData(PADAPTER pAdapter, u32 point)
* 1024 512 512 + 1024 = 1536
*
*/
u32 mp_query_psd(PADAPTER pAdapter, u8 *data)
u32 mp_query_psd(struct adapter * pAdapter, u8 *data)
{
u32 i, psd_pts=0, psd_start=0, psd_stop=0;
u32 psd_data=0;
@ -1078,7 +1078,7 @@ u32 mp_query_psd(PADAPTER pAdapter, u8 *data)
void _rtw_mp_xmit_priv (struct xmit_priv *pxmitpriv)
{
int i,res;
_adapter *padapter = pxmitpriv->adapter;
struct adapter *padapter = pxmitpriv->adapter;
struct xmit_frame *pxmitframe = (struct xmit_frame*) pxmitpriv->pxmit_frame_buf;
struct xmit_buf *pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf;

76
core/rtw_mp_ioctl.c
View file

@ -31,7 +31,7 @@
NDIS_STATUS oid_rt_wireless_mode_hdl(struct oid_par_priv *poid_par_priv)
{
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -59,7 +59,7 @@ NDIS_STATUS oid_rt_pro_write_bb_reg_hdl(struct oid_par_priv *poid_par_priv)
u16 offset;
u32 value;
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -97,7 +97,7 @@ NDIS_STATUS oid_rt_pro_read_bb_reg_hdl(struct oid_par_priv *poid_par_priv)
u16 offset;
u32 value;
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -136,7 +136,7 @@ NDIS_STATUS oid_rt_pro_write_rf_reg_hdl(struct oid_par_priv *poid_par_priv)
u8 offset;
u32 value;
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -180,7 +180,7 @@ NDIS_STATUS oid_rt_pro_read_rf_reg_hdl(struct oid_par_priv *poid_par_priv)
u8 path;
u8 offset;
u32 value;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
_func_enter_;
@ -228,7 +228,7 @@ NDIS_STATUS oid_rt_pro_set_data_rate_hdl(struct oid_par_priv *poid_par_priv)
{
u32 ratevalue;/* 4 */
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -262,7 +262,7 @@ NDIS_STATUS oid_rt_pro_start_test_hdl(struct oid_par_priv *poid_par_priv)
{
u32 mode;
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -299,7 +299,7 @@ _func_exit_;
NDIS_STATUS oid_rt_pro_stop_test_hdl(struct oid_par_priv *poid_par_priv)
{
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -323,7 +323,7 @@ NDIS_STATUS oid_rt_pro_set_channel_direct_call_hdl(struct oid_par_priv *poid_par
{
u32 Channel;
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -360,7 +360,7 @@ NDIS_STATUS oid_rt_set_bandwidth_hdl(struct oid_par_priv *poid_par_priv)
u16 bandwidth;
u16 channel_offset;
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * padapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -398,7 +398,7 @@ NDIS_STATUS oid_rt_pro_set_antenna_bb_hdl(struct oid_par_priv *poid_par_priv)
{
u32 antenna;
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -434,7 +434,7 @@ NDIS_STATUS oid_rt_pro_set_tx_power_control_hdl(struct oid_par_priv *poid_par_pr
{
u32 tx_pwr_idx;
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -471,7 +471,7 @@ _func_exit_;
NDIS_STATUS oid_rt_pro_query_tx_packet_sent_hdl(struct oid_par_priv *poid_par_priv)
{
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -495,7 +495,7 @@ _func_exit_;
NDIS_STATUS oid_rt_pro_query_rx_packet_received_hdl(struct oid_par_priv *poid_par_priv)
{
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -520,7 +520,7 @@ _func_exit_;
NDIS_STATUS oid_rt_pro_query_rx_packet_crc32_error_hdl(struct oid_par_priv *poid_par_priv)
{
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -546,7 +546,7 @@ _func_exit_;
NDIS_STATUS oid_rt_pro_reset_tx_packet_sent_hdl(struct oid_par_priv *poid_par_priv)
{
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -566,7 +566,7 @@ _func_exit_;
NDIS_STATUS oid_rt_pro_reset_rx_packet_received_hdl(struct oid_par_priv *poid_par_priv)
{
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -591,7 +591,7 @@ _func_exit_;
NDIS_STATUS oid_rt_reset_phy_rx_packet_count_hdl(struct oid_par_priv *poid_par_priv)
{
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -612,7 +612,7 @@ _func_exit_;
NDIS_STATUS oid_rt_get_phy_rx_packet_received_hdl(struct oid_par_priv *poid_par_priv)
{
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -640,7 +640,7 @@ _func_exit_;
NDIS_STATUS oid_rt_get_phy_rx_packet_crc32_error_hdl(struct oid_par_priv *poid_par_priv)
{
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -670,7 +670,7 @@ NDIS_STATUS oid_rt_pro_set_continuous_tx_hdl(struct oid_par_priv *poid_par_priv)
{
u32 bStartTest;
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -705,7 +705,7 @@ NDIS_STATUS oid_rt_pro_set_single_carrier_tx_hdl(struct oid_par_priv *poid_par_p
{
u32 bStartTest;
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -740,7 +740,7 @@ NDIS_STATUS oid_rt_pro_set_carrier_suppression_tx_hdl(struct oid_par_priv *poid_
{
u32 bStartTest;
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -775,7 +775,7 @@ NDIS_STATUS oid_rt_pro_set_single_tone_tx_hdl(struct oid_par_priv *poid_par_priv
{
u32 bStartTest;
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -802,7 +802,7 @@ NDIS_STATUS oid_rt_pro_set_modulation_hdl(struct oid_par_priv* poid_par_priv)
NDIS_STATUS oid_rt_pro_trigger_gpio_hdl(struct oid_par_priv *poid_par_priv)
{
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
_func_enter_;
@ -829,7 +829,7 @@ NDIS_STATUS oid_rt_pro_read_register_hdl(struct oid_par_priv *poid_par_priv)
struct mp_rw_reg * RegRWStruct;
u32 offset, width;
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -878,7 +878,7 @@ NDIS_STATUS oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv)
struct mp_rw_reg *RegRWStruct;
u32 offset, width, value;
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * padapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -997,7 +997,7 @@ NDIS_STATUS oid_rt_pro_cfg_debug_message_hdl(struct oid_par_priv *poid_par_priv)
/* */
NDIS_STATUS oid_rt_pro_set_data_rate_ex_hdl(struct oid_par_priv *poid_par_priv)
{
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
@ -1024,7 +1024,7 @@ NDIS_STATUS oid_rt_get_thermal_meter_hdl(struct oid_par_priv *poid_par_priv)
{
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
u8 thermal = 0;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -1056,7 +1056,7 @@ NDIS_STATUS oid_rt_pro_read_tssi_hdl(struct oid_par_priv *poid_par_priv)
NDIS_STATUS oid_rt_pro_set_power_tracking_hdl(struct oid_par_priv *poid_par_priv)
{
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -1136,7 +1136,7 @@ NDIS_STATUS oid_rt_pro_read_efuse_hdl(struct oid_par_priv *poid_par_priv)
u8 *data;
u16 addr = 0, cnts = 0, max_available_size = 0;
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -1181,7 +1181,7 @@ NDIS_STATUS oid_rt_pro_write_efuse_hdl(struct oid_par_priv *poid_par_priv)
u8 *data;
u16 addr = 0, cnts = 0, max_available_size = 0;
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -1219,7 +1219,7 @@ NDIS_STATUS oid_rt_pro_rw_efuse_pgpkt_hdl(struct oid_par_priv *poid_par_priv)
{
struct pgpkt *ppgpkt;
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -1272,7 +1272,7 @@ NDIS_STATUS oid_rt_get_efuse_current_size_hdl(struct oid_par_priv *poid_par_priv
u16 size;
u8 ret;
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -1299,7 +1299,7 @@ _func_exit_;
NDIS_STATUS oid_rt_get_efuse_max_size_hdl(struct oid_par_priv *poid_par_priv)
{
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_;
@ -1345,7 +1345,7 @@ NDIS_STATUS oid_rt_pro_efuse_map_hdl(struct oid_par_priv *poid_par_priv)
{
u8 *data;
NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
u16 mapLen=0;
_func_enter_;
@ -1441,14 +1441,14 @@ NDIS_STATUS oid_rt_pro_set_pkt_test_mode_hdl(struct oid_par_priv *poid_par_priv)
unsigned int mp_ioctl_xmit_packet_hdl(struct oid_par_priv *poid_par_priv)
{
struct mp_xmit_parm * pparm;
PADAPTER padapter;
struct adapter * padapter;
struct mp_priv *pmp_priv;
struct pkt_attrib *pattrib;
RT_TRACE(_module_mp_, _drv_notice_, ("+%s\n", __func__));
pparm = (struct mp_xmit_parm *)poid_par_priv->information_buf;
padapter = (PADAPTER)poid_par_priv->adapter_context;
padapter = (struct adapter *)poid_par_priv->adapter_context;
pmp_priv = &padapter->mppriv;
if (poid_par_priv->type_of_oid == QUERY_OID) {

58
core/rtw_p2p.c
View file

@ -40,7 +40,7 @@ static int rtw_p2p_is_channel_list_ok( u8 desired_ch, u8* ch_list, u8 ch_cnt )
return( found );
}
static int is_any_client_associated( _adapter *padapter)
static int is_any_client_associated( struct adapter *padapter)
{
unsigned long irqL;
struct list_head *phead, *plist;
@ -81,7 +81,7 @@ static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf)
u16 attr_len = 0;
u8 tmplen, *pdata_attr, *pstart, *pcur;
struct sta_info *psta = NULL;
_adapter *padapter = pwdinfo->padapter;
struct adapter *padapter = pwdinfo->padapter;
struct sta_priv *pstapriv = &padapter->stapriv;
DBG_88E("%s\n", __func__);
@ -181,7 +181,7 @@ static void issue_group_disc_req(struct wifidirect_info *pwdinfo, u8 *da)
unsigned char *pframe;
struct rtw_ieee80211_hdr *pwlanhdr;
unsigned short *fctrl;
_adapter *padapter = pwdinfo->padapter;
struct adapter *padapter = pwdinfo->padapter;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
unsigned char category = RTW_WLAN_CATEGORY_P2P;/* P2P action frame */
@ -240,7 +240,7 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 s
unsigned char *pframe;
struct rtw_ieee80211_hdr *pwlanhdr;
unsigned short *fctrl;
_adapter *padapter = pwdinfo->padapter;
struct adapter *padapter = pwdinfo->padapter;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
@ -309,7 +309,7 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 s
static void issue_p2p_provision_resp(struct wifidirect_info *pwdinfo, u8* raddr, u8* frame_body, u16 config_method)
{
_adapter *padapter = pwdinfo->padapter;
struct adapter *padapter = pwdinfo->padapter;
unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION;
u8 dialogToken = frame_body[7]; /* The Dialog Token of provisioning discovery request frame. */
@ -392,7 +392,7 @@ static void issue_p2p_presence_resp(struct wifidirect_info *pwdinfo, u8 *da, u8
unsigned char *pframe;
struct rtw_ieee80211_hdr *pwlanhdr;
unsigned short *fctrl;
_adapter *padapter = pwdinfo->padapter;
struct adapter *padapter = pwdinfo->padapter;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
unsigned char category = RTW_WLAN_CATEGORY_P2P;/* P2P action frame */
@ -1049,7 +1049,7 @@ u32 process_p2p_devdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le
u8 *frame_body;
u8 status, dialogToken;
struct sta_info *psta = NULL;
_adapter *padapter = pwdinfo->padapter;
struct adapter *padapter = pwdinfo->padapter;
struct sta_priv *pstapriv = &padapter->stapriv;
u8 *p2p_ie;
u32 p2p_ielen = 0;
@ -1220,7 +1220,7 @@ static u8 rtw_p2p_ch_inclusion(struct mlme_ext_priv *pmlmeext, u8 *peer_ch_list,
u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe, uint len )
{
_adapter *padapter = pwdinfo->padapter;
struct adapter *padapter = pwdinfo->padapter;
u8 result = P2P_STATUS_SUCCESS;
u32 p2p_ielen = 0, wps_ielen = 0;
u8 * ies;
@ -1386,7 +1386,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pframe, uint len )
{
_adapter *padapter = pwdinfo->padapter;
struct adapter *padapter = pwdinfo->padapter;
u8 result = P2P_STATUS_SUCCESS;
u32 p2p_ielen, wps_ielen;
u8 * ies;
@ -1697,7 +1697,7 @@ u8 process_p2p_presence_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le
return true;
}
static void find_phase_handler( _adapter* padapter )
static void find_phase_handler( struct adapter* padapter )
{
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -1719,9 +1719,9 @@ _func_enter_;
_func_exit_;
}
void p2p_concurrent_handler( _adapter* padapter );
void p2p_concurrent_handler( struct adapter* padapter );
static void restore_p2p_state_handler( _adapter* padapter )
static void restore_p2p_state_handler( struct adapter* padapter )
{
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -1743,7 +1743,7 @@ _func_enter_;
_func_exit_;
}
static void pre_tx_invitereq_handler( _adapter* padapter )
static void pre_tx_invitereq_handler( struct adapter* padapter )
{
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
u8 val8 = 1;
@ -1757,7 +1757,7 @@ _func_enter_;
_func_exit_;
}
static void pre_tx_provdisc_handler( _adapter* padapter )
static void pre_tx_provdisc_handler( struct adapter* padapter )
{
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
u8 val8 = 1;
@ -1771,7 +1771,7 @@ _func_enter_;
_func_exit_;
}
static void pre_tx_negoreq_handler( _adapter* padapter )
static void pre_tx_negoreq_handler( struct adapter* padapter )
{
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
u8 val8 = 1;
@ -1785,7 +1785,7 @@ _func_enter_;
_func_exit_;
}
void p2p_protocol_wk_hdl(_adapter *padapter, int intCmdType)
void p2p_protocol_wk_hdl(struct adapter *padapter, int intCmdType)
{
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
@ -1812,7 +1812,7 @@ _func_enter_;
_func_exit_;
}
void process_p2p_ps_ie(PADAPTER padapter, u8 *IEs, u32 IELength)
void process_p2p_ps_ie(struct adapter * padapter, u8 *IEs, u32 IELength)
{
u8 * ies;
u32 ies_len;
@ -1919,7 +1919,7 @@ _func_enter_;
_func_exit_;
}
void p2p_ps_wk_hdl(_adapter *padapter, u8 p2p_ps_state)
void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_ps_state)
{
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
@ -1979,7 +1979,7 @@ _func_enter_;
_func_exit_;
}
u8 p2p_ps_wk_cmd(_adapter*padapter, u8 p2p_ps_state, u8 enqueue)
u8 p2p_ps_wk_cmd(struct adapter*padapter, u8 p2p_ps_state, u8 enqueue)
{
struct cmd_obj *ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -2029,7 +2029,7 @@ _func_exit_;
static void reset_ch_sitesurvey_timer_process (void *FunctionContext)
{
_adapter *adapter = (_adapter *)FunctionContext;
struct adapter *adapter = (struct adapter *)FunctionContext;
struct wifidirect_info *pwdinfo = &adapter->wdinfo;
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
@ -2043,7 +2043,7 @@ static void reset_ch_sitesurvey_timer_process (void *FunctionContext)
static void reset_ch_sitesurvey_timer_process2 (void *FunctionContext)
{
_adapter *adapter = (_adapter *)FunctionContext;
struct adapter *adapter = (struct adapter *)FunctionContext;
struct wifidirect_info *pwdinfo = &adapter->wdinfo;
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
@ -2057,7 +2057,7 @@ static void reset_ch_sitesurvey_timer_process2 (void *FunctionContext)
static void restore_p2p_state_timer_process (void *FunctionContext)
{
_adapter *adapter = (_adapter *)FunctionContext;
struct adapter *adapter = (struct adapter *)FunctionContext;
struct wifidirect_info *pwdinfo = &adapter->wdinfo;
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
@ -2068,7 +2068,7 @@ static void restore_p2p_state_timer_process (void *FunctionContext)
static void pre_tx_scan_timer_process (void *FunctionContext)
{
_adapter *adapter = (_adapter *) FunctionContext;
struct adapter *adapter = (struct adapter *) FunctionContext;
struct wifidirect_info *pwdinfo = &adapter->wdinfo;
unsigned long irqL;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@ -2113,7 +2113,7 @@ static void pre_tx_scan_timer_process (void *FunctionContext)
static void find_phase_timer_process (void *FunctionContext)
{
_adapter *adapter = (_adapter *)FunctionContext;
struct adapter *adapter = (struct adapter *)FunctionContext;
struct wifidirect_info *pwdinfo = &adapter->wdinfo;
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
@ -2124,7 +2124,7 @@ static void find_phase_timer_process (void *FunctionContext)
p2p_protocol_wk_cmd( adapter, P2P_FIND_PHASE_WK );
}
void reset_global_wifidirect_info( _adapter* padapter )
void reset_global_wifidirect_info( struct adapter* padapter )
{
struct wifidirect_info *pwdinfo;
@ -2135,7 +2135,7 @@ void reset_global_wifidirect_info( _adapter* padapter )
pwdinfo->wfd_tdls_weaksec = 0;
}
void rtw_init_wifidirect_timers(_adapter* padapter)
void rtw_init_wifidirect_timers(struct adapter* padapter)
{
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
@ -2146,7 +2146,7 @@ void rtw_init_wifidirect_timers(_adapter* padapter)
_init_timer( &pwdinfo->reset_ch_sitesurvey2, padapter->pnetdev, reset_ch_sitesurvey_timer_process2, padapter );
}
void rtw_init_wifidirect_addrs(_adapter* padapter, u8 *dev_addr, u8 *iface_addr)
void rtw_init_wifidirect_addrs(struct adapter* padapter, u8 *dev_addr, u8 *iface_addr)
{
#ifdef CONFIG_P2P
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
@ -2161,7 +2161,7 @@ void rtw_init_wifidirect_addrs(_adapter* padapter, u8 *dev_addr, u8 *iface_addr)
#endif
}
void init_wifidirect_info( _adapter* padapter, enum P2P_ROLE role)
void init_wifidirect_info( struct adapter* padapter, enum P2P_ROLE role)
{
struct wifidirect_info *pwdinfo;
@ -2258,7 +2258,7 @@ void init_wifidirect_info( _adapter* padapter, enum P2P_ROLE role)
pwdinfo->p2p_info.scan_op_ch_only = 0;
}
int rtw_p2p_enable(_adapter *padapter, enum P2P_ROLE role)
int rtw_p2p_enable(struct adapter *padapter, enum P2P_ROLE role)
{
int ret = _SUCCESS;
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);

46
core/rtw_pwrctrl.c
View file

@ -28,7 +28,7 @@
#include <rtl8723a_hal.h>
#endif
void ips_enter(_adapter * padapter)
void ips_enter(struct adapter * padapter)
{
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -76,7 +76,7 @@ void ips_enter(_adapter * padapter)
}
int ips_leave(_adapter * padapter)
int ips_leave(struct adapter * padapter)
{
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
struct security_priv* psecuritypriv=&(padapter->securitypriv);
@ -125,9 +125,9 @@ int ips_leave(_adapter * padapter)
return result;
}
static bool rtw_pwr_unassociated_idle(_adapter *adapter)
static bool rtw_pwr_unassociated_idle(struct adapter *adapter)
{
_adapter *buddy = adapter->pbuddy_adapter;
struct adapter *buddy = adapter->pbuddy_adapter;
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
#ifdef CONFIG_P2P
struct wifidirect_info *pwdinfo = &(adapter->wdinfo);
@ -175,7 +175,7 @@ exit:
return ret;
}
void rtw_ps_processor(_adapter*padapter)
void rtw_ps_processor(struct adapter*padapter)
{
#ifdef CONFIG_P2P
struct wifidirect_info *pwdinfo = &( padapter->wdinfo );
@ -235,7 +235,7 @@ exit:
void pwr_state_check_handler(void *FunctionContext)
{
_adapter *padapter = (_adapter *)FunctionContext;
struct adapter *padapter = (struct adapter *)FunctionContext;
rtw_ps_cmd(padapter);
}
@ -246,7 +246,7 @@ void pwr_state_check_handler(void *FunctionContext)
* pslv power state level, only could be PS_STATE_S0 ~ PS_STATE_S4
*
*/
void rtw_set_rpwm(PADAPTER padapter, u8 pslv)
void rtw_set_rpwm(struct adapter * padapter, u8 pslv)
{
u8 rpwm;
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
@ -306,8 +306,8 @@ _func_enter_;
_func_exit_;
}
u8 PS_RDY_CHECK(_adapter * padapter);
u8 PS_RDY_CHECK(_adapter * padapter)
u8 PS_RDY_CHECK(struct adapter * padapter);
u8 PS_RDY_CHECK(struct adapter * padapter)
{
u32 curr_time, delta_time;
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
@ -345,7 +345,7 @@ u8 PS_RDY_CHECK(_adapter * padapter)
return true;
}
void rtw_set_ps_mode(PADAPTER padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode)
void rtw_set_ps_mode(struct adapter * padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode)
{
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
#ifdef CONFIG_P2P
@ -416,7 +416,7 @@ _func_exit_;
* -1: Timeout
* -2: Other error
*/
s32 LPS_RF_ON_check(PADAPTER padapter, u32 delay_ms)
s32 LPS_RF_ON_check(struct adapter * padapter, u32 delay_ms)
{
u32 start_time;
u8 bAwake = false;
@ -453,11 +453,11 @@ s32 LPS_RF_ON_check(PADAPTER padapter, u32 delay_ms)
/* Description: */
/* Enter the leisure power save mode. */
/* */
void LPS_Enter(PADAPTER padapter)
void LPS_Enter(struct adapter * padapter)
{
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
_adapter *buddy = padapter->pbuddy_adapter;
struct adapter *buddy = padapter->pbuddy_adapter;
_func_enter_;
@ -490,7 +490,7 @@ _func_exit_;
/* Description: */
/* Leave the leisure power save mode. */
/* */
void LPS_Leave(PADAPTER padapter)
void LPS_Leave(struct adapter * padapter)
{
#define LPS_LEAVE_TIMEOUT_MS 100
@ -522,7 +522,7 @@ _func_exit_;
/* Description: Leave all power save mode: LPS, FwLPS, IPS if needed. */
/* Move code to function by tynli. 2010.03.26. */
/* */
void LeaveAllPowerSaveMode(PADAPTER Adapter)
void LeaveAllPowerSaveMode(struct adapter * Adapter)
{
struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv);
u8 enqueue = 0;
@ -539,7 +539,7 @@ _func_enter_;
_func_exit_;
}
void rtw_init_pwrctrl_priv(PADAPTER padapter)
void rtw_init_pwrctrl_priv(struct adapter * padapter)
{
struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
@ -585,7 +585,7 @@ _func_enter_;
_func_exit_;
}
void rtw_free_pwrctrl_priv(PADAPTER adapter)
void rtw_free_pwrctrl_priv(struct adapter * adapter)
{
struct pwrctrl_priv *pwrctrlpriv = &adapter->pwrctrlpriv;
@ -596,7 +596,7 @@ _func_enter_;
_func_exit_;
}
u8 rtw_interface_ps_func(_adapter *padapter,enum hal_intf_ps_func efunc_id,u8* val)
u8 rtw_interface_ps_func(struct adapter *padapter,enum hal_intf_ps_func efunc_id,u8* val)
{
u8 bResult = true;
rtw_hal_intf_ps_func(padapter,efunc_id,val);
@ -605,7 +605,7 @@ u8 rtw_interface_ps_func(_adapter *padapter,enum hal_intf_ps_func efunc_id,u8* v
}
inline void rtw_set_ips_deny(_adapter *padapter, u32 ms)
inline void rtw_set_ips_deny(struct adapter *padapter, u32 ms)
{
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
pwrpriv->ips_deny_time = rtw_get_current_time() + rtw_ms_to_systime(ms);
@ -613,12 +613,12 @@ inline void rtw_set_ips_deny(_adapter *padapter, u32 ms)
/*
* rtw_pwr_wakeup - Wake the NIC up from: 1)IPS. 2)USB autosuspend
* @adapter: pointer to _adapter structure
* @adapter: pointer to struct adapter structure
* @ips_deffer_ms: the ms wiil prevent from falling into IPS after wakeup
* Return _SUCCESS or _FAIL
*/
int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller)
int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *caller)
{
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -690,7 +690,7 @@ exit:
}
int rtw_pm_set_lps(_adapter *padapter, u8 mode)
int rtw_pm_set_lps(struct adapter *padapter, u8 mode)
{
int ret = 0;
struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
@ -719,7 +719,7 @@ int rtw_pm_set_lps(_adapter *padapter, u8 mode)
return ret;
}
int rtw_pm_set_ips(_adapter *padapter, u8 mode)
int rtw_pm_set_ips(struct adapter *padapter, u8 mode)
{
struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;

78
core/rtw_recv.c
View file

@ -48,7 +48,7 @@ _func_exit_;
}
int _rtw_init_recv_priv(struct recv_priv *precvpriv, _adapter *padapter)
int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
{
int i;
@ -124,7 +124,7 @@ void rtw_mfree_recv_priv_lock(struct recv_priv *precvpriv)
void _rtw_free_recv_priv (struct recv_priv *precvpriv)
{
_adapter *padapter = precvpriv->adapter;
struct adapter *padapter = precvpriv->adapter;
_func_enter_;
@ -149,7 +149,7 @@ union recv_frame *_rtw_alloc_recvframe (struct __queue *pfree_recv_queue)
union recv_frame *precvframe;
struct list_head *plist, *phead;
_adapter *padapter;
struct adapter *padapter;
struct recv_priv *precvpriv;
_func_enter_;
@ -205,7 +205,7 @@ void rtw_init_recvframe(union recv_frame *precvframe, struct recv_priv *precvpri
int rtw_free_recvframe(union recv_frame *precvframe, struct __queue *pfree_recv_queue)
{
unsigned long irqL;
_adapter *padapter=precvframe->u.hdr.adapter;
struct adapter *padapter=precvframe->u.hdr.adapter;
struct recv_priv *precvpriv = &padapter->recvpriv;
_func_enter_;
@ -242,7 +242,7 @@ _func_exit_;
int _rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *queue)
{
_adapter *padapter=precvframe->u.hdr.adapter;
struct adapter *padapter=precvframe->u.hdr.adapter;
struct recv_priv *precvpriv = &padapter->recvpriv;
_func_enter_;
@ -306,7 +306,7 @@ _func_exit_;
}
u32 rtw_free_uc_swdec_pending_queue(_adapter *adapter)
u32 rtw_free_uc_swdec_pending_queue(struct adapter *adapter)
{
u32 cnt = 0;
union recv_frame *pending_frame;
@ -376,7 +376,7 @@ struct recv_buf *rtw_dequeue_recvbuf (struct __queue *queue)
}
int recvframe_chkmic(_adapter *adapter, union recv_frame *precvframe){
int recvframe_chkmic(struct adapter *adapter, union recv_frame *precvframe){
int i,res=_SUCCESS;
u32 datalen;
@ -513,8 +513,8 @@ _func_exit_;
}
/* decrypt and set the ivlen,icvlen of the recv_frame */
union recv_frame * decryptor(_adapter *padapter,union recv_frame *precv_frame);
union recv_frame * decryptor(_adapter *padapter,union recv_frame *precv_frame)
union recv_frame * decryptor(struct adapter *padapter,union recv_frame *precv_frame);
union recv_frame * decryptor(struct adapter *padapter,union recv_frame *precv_frame)
{
struct rx_pkt_attrib *prxattrib = &precv_frame->u.hdr.attrib;
@ -582,7 +582,7 @@ _func_exit_;
}
/* set the security information in the recv_frame */
union recv_frame *portctrl(_adapter *adapter, union recv_frame *precv_frame)
union recv_frame *portctrl(struct adapter *adapter, union recv_frame *precv_frame)
{
u8 *psta_addr, *ptr;
uint auth_alg;
@ -706,8 +706,8 @@ _func_exit_;
}
void process_pwrbit_data(_adapter *padapter, union recv_frame *precv_frame);
void process_pwrbit_data(_adapter *padapter, union recv_frame *precv_frame)
void process_pwrbit_data(struct adapter *padapter, union recv_frame *precv_frame);
void process_pwrbit_data(struct adapter *padapter, union recv_frame *precv_frame)
{
#ifdef CONFIG_AP_MODE
unsigned char pwrbit;
@ -752,8 +752,8 @@ void process_pwrbit_data(_adapter *padapter, union recv_frame *precv_frame)
#endif
}
void process_wmmps_data(_adapter *padapter, union recv_frame *precv_frame);
void process_wmmps_data(_adapter *padapter, union recv_frame *precv_frame)
void process_wmmps_data(struct adapter *padapter, union recv_frame *precv_frame);
void process_wmmps_data(struct adapter *padapter, union recv_frame *precv_frame)
{
#ifdef CONFIG_AP_MODE
struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
@ -815,7 +815,7 @@ void process_wmmps_data(_adapter *padapter, union recv_frame *precv_frame)
}
void count_rx_stats(_adapter *padapter, union recv_frame *prframe, struct sta_info*sta)
void count_rx_stats(struct adapter *padapter, union recv_frame *prframe, struct sta_info*sta)
{
int sz;
struct sta_info *psta = NULL;
@ -848,12 +848,12 @@ void count_rx_stats(_adapter *padapter, union recv_frame *prframe, struct sta_in
}
int sta2sta_data_frame(
_adapter *adapter,
struct adapter *adapter,
union recv_frame *precv_frame,
struct sta_info**psta
);
int sta2sta_data_frame(
_adapter *adapter,
struct adapter *adapter,
union recv_frame *precv_frame,
struct sta_info**psta
)
@ -970,7 +970,7 @@ _func_exit_;
}
int ap2sta_data_frame(
_adapter *adapter,
struct adapter *adapter,
union recv_frame *precv_frame,
struct sta_info**psta )
{
@ -1102,7 +1102,7 @@ _func_exit_;
}
int sta2ap_data_frame(
_adapter *adapter,
struct adapter *adapter,
union recv_frame *precv_frame,
struct sta_info**psta )
{
@ -1169,7 +1169,7 @@ _func_exit_;
}
int validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame)
int validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_frame)
{
#ifdef CONFIG_AP_MODE
struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
@ -1327,9 +1327,9 @@ int validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame)
}
union recv_frame* recvframe_chk_defrag(PADAPTER padapter, union recv_frame *precv_frame);
union recv_frame* recvframe_chk_defrag(struct adapter * padapter, union recv_frame *precv_frame);
int validate_recv_mgnt_frame(PADAPTER padapter, union recv_frame *precv_frame)
int validate_recv_mgnt_frame(struct adapter * padapter, union recv_frame *precv_frame)
{
/* struct mlme_priv *pmlmepriv = &adapter->mlmepriv; */
@ -1367,7 +1367,7 @@ int validate_recv_mgnt_frame(PADAPTER padapter, union recv_frame *precv_frame)
return _SUCCESS;
}
int validate_recv_data_frame(_adapter *adapter, union recv_frame *precv_frame)
int validate_recv_data_frame(struct adapter *adapter, union recv_frame *precv_frame)
{
u8 bretry;
u8 *psa, *pda, *pbssid;
@ -1507,7 +1507,7 @@ _func_exit_;
return ret;
}
int validate_recv_frame(_adapter *adapter, union recv_frame *precv_frame)
int validate_recv_frame(struct adapter *adapter, union recv_frame *precv_frame)
{
/* shall check frame subtype, to / from ds, da, bssid */
@ -1642,7 +1642,7 @@ int wlanhdr_to_ethhdr ( union recv_frame *precvframe)
struct ieee80211_snap_hdr *psnap;
int ret=_SUCCESS;
_adapter *adapter =precvframe->u.hdr.adapter;
struct adapter *adapter =precvframe->u.hdr.adapter;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
u8 *ptr = get_recvframe_data(precvframe) ; /* point to frame_ctrl field */
@ -1708,7 +1708,7 @@ _func_exit_;
}
/* perform defrag */
union recv_frame *recvframe_defrag(_adapter *adapter, struct __queue *defrag_q)
union recv_frame *recvframe_defrag(struct adapter *adapter, struct __queue *defrag_q)
{
struct list_head *plist, *phead;
u8 wlanhdr_offset;
@ -1795,7 +1795,7 @@ _func_exit_;
}
/* check if need to defrag, if needed queue the frame to defrag_q */
union recv_frame* recvframe_chk_defrag(PADAPTER padapter, union recv_frame *precv_frame)
union recv_frame* recvframe_chk_defrag(struct adapter * padapter, union recv_frame *precv_frame)
{
u8 ismfrag;
u8 fragnum;
@ -1918,7 +1918,7 @@ _func_exit_;
}
static int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
static int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe)
{
int a_len, padding_len;
u16 eth_type, nSubframe_Length;
@ -2110,7 +2110,7 @@ int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union rec
return true;
}
static int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced)
static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced)
{
struct list_head *phead, *plist;
union recv_frame *prframe;
@ -2188,7 +2188,7 @@ static int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ct
return bPktInBuf;
}
static int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *prframe)
{
unsigned long irql;
int retval = _SUCCESS;
@ -2304,7 +2304,7 @@ void rtw_reordering_ctrl_timeout_handler(void *pcontext)
{
unsigned long irql;
struct recv_reorder_ctrl *preorder_ctrl = (struct recv_reorder_ctrl *)pcontext;
_adapter *padapter = preorder_ctrl->padapter;
struct adapter *padapter = preorder_ctrl->padapter;
struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
@ -2326,8 +2326,8 @@ void rtw_reordering_ctrl_timeout_handler(void *pcontext)
}
int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe);
int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe)
int process_recv_indicatepkts(struct adapter *padapter, union recv_frame *prframe);
int process_recv_indicatepkts(struct adapter *padapter, union recv_frame *prframe)
{
int retval = _SUCCESS;
/* struct recv_priv *precvpriv = &padapter->recvpriv; */
@ -2385,7 +2385,7 @@ int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe)
}
static int recv_func_prehandle(_adapter *padapter, union recv_frame *rframe)
static int recv_func_prehandle(struct adapter *padapter, union recv_frame *rframe)
{
int ret = _SUCCESS;
struct rx_pkt_attrib *pattrib = &rframe->u.hdr.attrib;
@ -2424,7 +2424,7 @@ exit:
return ret;
}
static int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
static int recv_func_posthandle(struct adapter *padapter, union recv_frame *prframe)
{
int ret = _SUCCESS;
union recv_frame *orig_prframe = prframe;
@ -2520,8 +2520,8 @@ _recv_data_drop:
}
int recv_func(_adapter *padapter, union recv_frame *rframe);
int recv_func(_adapter *padapter, union recv_frame *rframe)
int recv_func(struct adapter *padapter, union recv_frame *rframe);
int recv_func(struct adapter *padapter, union recv_frame *rframe)
{
int ret;
struct rx_pkt_attrib *prxattrib = &rframe->u.hdr.attrib;
@ -2566,7 +2566,7 @@ exit:
s32 rtw_recv_entry(union recv_frame *precvframe)
{
_adapter *padapter;
struct adapter *padapter;
struct recv_priv *precvpriv;
s32 ret=_SUCCESS;
@ -2603,7 +2603,7 @@ _func_exit_;
}
void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS){
_adapter *adapter = (_adapter *)FunctionContext;
struct adapter *adapter = (struct adapter *)FunctionContext;
struct recv_priv *recvpriv = &adapter->recvpriv;
u32 tmp_s, tmp_q;

14
core/rtw_security.c
View file

@ -158,7 +158,7 @@ _func_exit_;
/*
Need to consider the fragment situation
*/
void rtw_wep_encrypt(_adapter *padapter, u8 *pxmitframe)
void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe)
{ /* exclude ICV */
unsigned char crc[4];
@ -230,7 +230,7 @@ _func_exit_;
}
void rtw_wep_decrypt(_adapter *padapter, u8 *precvframe)
void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe)
{
/* exclude ICV */
u8 crc[4];
@ -634,7 +634,7 @@ _func_exit_;
/* The hlen isn't include the IV */
u32 rtw_tkip_encrypt(_adapter *padapter, u8 *pxmitframe)
u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
{ /* exclude ICV */
u16 pnl;
u32 pnh;
@ -737,7 +737,7 @@ _func_exit_;
/* The hlen isn't include the IV */
u32 rtw_tkip_decrypt(_adapter *padapter, u8 *precvframe)
u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
{ /* exclude ICV */
u16 pnl;
u32 pnh;
@ -1462,7 +1462,7 @@ _func_exit_;
u32 rtw_aes_encrypt(_adapter *padapter, u8 *pxmitframe)
u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
{ /* exclude ICV */
@ -1812,7 +1812,7 @@ _func_exit_;
return res;
}
u32 rtw_aes_decrypt(_adapter *padapter, u8 *precvframe)
u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
{ /* exclude ICV */
@ -2570,7 +2570,7 @@ static int omac1_aes_128(u8 *key, u8 *data, size_t data_len, u8 *mac)
void rtw_use_tkipkey_handler(void *FunctionContext)
{
_adapter *padapter = (_adapter *)FunctionContext;
struct adapter *padapter = (struct adapter *)FunctionContext;
_func_enter_;

8
core/rtw_sreset.c
View file

@ -20,7 +20,7 @@
#include <rtw_sreset.h>
void sreset_init_value(_adapter *padapter)
void sreset_init_value(struct adapter *padapter)
{
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct sreset_priv *psrtpriv = &pHalData->srestpriv;
@ -31,7 +31,7 @@ void sreset_init_value(_adapter *padapter)
psrtpriv->last_tx_time =0;
psrtpriv->last_tx_complete_time =0;
}
void sreset_reset_value(_adapter *padapter)
void sreset_reset_value(struct adapter *padapter)
{
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct sreset_priv *psrtpriv = &pHalData->srestpriv;
@ -42,7 +42,7 @@ void sreset_reset_value(_adapter *padapter)
psrtpriv->last_tx_complete_time =0;
}
u8 sreset_get_wifi_status(_adapter *padapter)
u8 sreset_get_wifi_status(struct adapter *padapter)
{
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct sreset_priv *psrtpriv = &pHalData->srestpriv;
@ -76,7 +76,7 @@ u8 sreset_get_wifi_status(_adapter *padapter)
return status;
}
void sreset_set_wifi_error_status(_adapter *padapter, u32 status)
void sreset_set_wifi_error_status(struct adapter *padapter, u32 status)
{
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
pHalData->srestpriv.Wifi_Error_Status = status;

10
core/rtw_sta_mgt.c
View file

@ -388,7 +388,7 @@ _func_exit_;
/* using pstapriv->sta_hash_lock to protect */
u32 rtw_free_stainfo(_adapter *padapter , struct sta_info *psta)
u32 rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta)
{
int i;
unsigned long irqL0;
@ -530,7 +530,7 @@ _func_exit_;
}
/* free all stainfo which in sta_hash[all] */
void rtw_free_all_stainfo(_adapter *padapter)
void rtw_free_all_stainfo(struct adapter *padapter)
{
unsigned long irqL;
struct list_head *plist, *phead;
@ -618,7 +618,7 @@ _func_exit_;
}
u32 rtw_init_bcmc_stainfo(_adapter* padapter)
u32 rtw_init_bcmc_stainfo(struct adapter* padapter)
{
struct sta_info *psta;
u32 res=_SUCCESS;
@ -643,7 +643,7 @@ _func_exit_;
return res;
}
struct sta_info* rtw_get_bcmc_stainfo(_adapter* padapter)
struct sta_info* rtw_get_bcmc_stainfo(struct adapter* padapter)
{
struct sta_info *psta;
struct sta_priv *pstapriv = &padapter->stapriv;
@ -655,7 +655,7 @@ _func_exit_;
}
u8 rtw_access_ctrl(_adapter *padapter, u8 *mac_addr)
u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr)
{
u8 res = true;
#ifdef CONFIG_AP_MODE

120
core/rtw_wlan_util.c
View file

@ -136,7 +136,7 @@ unsigned char networktype_to_raid(unsigned char network_type)
}
u8 judge_network_type(_adapter *padapter, unsigned char *rate, int ratelen)
u8 judge_network_type(struct adapter *padapter, unsigned char *rate, int ratelen)
{
u8 network_type = 0;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -237,8 +237,8 @@ unsigned char ratetbl_val_2wifirate(unsigned char rate)
}
int is_basicrate(_adapter *padapter, unsigned char rate);
int is_basicrate(_adapter *padapter, unsigned char rate)
int is_basicrate(struct adapter *padapter, unsigned char rate);
int is_basicrate(struct adapter *padapter, unsigned char rate)
{
int i;
unsigned char val;
@ -260,8 +260,8 @@ int is_basicrate(_adapter *padapter, unsigned char rate)
return false;
}
unsigned int ratetbl2rateset(_adapter *padapter, unsigned char *rateset);
unsigned int ratetbl2rateset(_adapter *padapter, unsigned char *rateset)
unsigned int ratetbl2rateset(struct adapter *padapter, unsigned char *rateset);
unsigned int ratetbl2rateset(struct adapter *padapter, unsigned char *rateset)
{
int i;
unsigned char rate;
@ -296,7 +296,7 @@ unsigned int ratetbl2rateset(_adapter *padapter, unsigned char *rateset)
return len;
}
void get_rate_set(_adapter *padapter, unsigned char *pbssrate, int *bssrate_len)
void get_rate_set(struct adapter *padapter, unsigned char *pbssrate, int *bssrate_len)
{
unsigned char supportedrates[NumRates];
@ -305,7 +305,7 @@ void get_rate_set(_adapter *padapter, unsigned char *pbssrate, int *bssrate_len)
_rtw_memcpy(pbssrate, supportedrates, *bssrate_len);
}
void UpdateBrateTbl(PADAPTER Adapter, u8 *mBratesOS)
void UpdateBrateTbl(struct adapter * Adapter, u8 *mBratesOS)
{
u8 i;
u8 rate;
@ -348,21 +348,21 @@ void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen)
}
void Save_DM_Func_Flag(_adapter *padapter)
void Save_DM_Func_Flag(struct adapter *padapter)
{
u8 bSaveFlag = true;
rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_OP, (u8 *)(&bSaveFlag));
}
void Restore_DM_Func_Flag(_adapter *padapter)
void Restore_DM_Func_Flag(struct adapter *padapter)
{
u8 bSaveFlag = false;
rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_OP, (u8 *)(&bSaveFlag));
}
void Switch_DM_Func(_adapter *padapter, u32 mode, u8 enable)
void Switch_DM_Func(struct adapter *padapter, u32 mode, u8 enable)
{
if (enable == true)
rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_SET, (u8 *)(&mode));
@ -370,52 +370,52 @@ void Switch_DM_Func(_adapter *padapter, u32 mode, u8 enable)
rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_CLR, (u8 *)(&mode));
}
static void Set_NETYPE1_MSR(_adapter *padapter, u8 type)
static void Set_NETYPE1_MSR(struct adapter *padapter, u8 type)
{
rtw_hal_set_hwreg(padapter, HW_VAR_MEDIA_STATUS1, (u8 *)(&type));
}
static void Set_NETYPE0_MSR(_adapter *padapter, u8 type)
static void Set_NETYPE0_MSR(struct adapter *padapter, u8 type)
{
rtw_hal_set_hwreg(padapter, HW_VAR_MEDIA_STATUS, (u8 *)(&type));
}
void Set_MSR(_adapter *padapter, u8 type)
void Set_MSR(struct adapter *padapter, u8 type)
{
Set_NETYPE0_MSR(padapter, type);
}
inline u8 rtw_get_oper_ch(_adapter *adapter)
inline u8 rtw_get_oper_ch(struct adapter *adapter)
{
return adapter->mlmeextpriv.oper_channel;
}
inline void rtw_set_oper_ch(_adapter *adapter, u8 ch)
inline void rtw_set_oper_ch(struct adapter *adapter, u8 ch)
{
adapter->mlmeextpriv.oper_channel = ch;
}
inline u8 rtw_get_oper_bw(_adapter *adapter)
inline u8 rtw_get_oper_bw(struct adapter *adapter)
{
return adapter->mlmeextpriv.oper_bwmode;
}
inline void rtw_set_oper_bw(_adapter *adapter, u8 bw)
inline void rtw_set_oper_bw(struct adapter *adapter, u8 bw)
{
adapter->mlmeextpriv.oper_bwmode = bw;
}
inline u8 rtw_get_oper_choffset(_adapter *adapter)
inline u8 rtw_get_oper_choffset(struct adapter *adapter)
{
return adapter->mlmeextpriv.oper_ch_offset;
}
inline void rtw_set_oper_choffset(_adapter *adapter, u8 offset)
inline void rtw_set_oper_choffset(struct adapter *adapter, u8 offset)
{
adapter->mlmeextpriv.oper_ch_offset = offset;
}
void SelectChannel(_adapter *padapter, unsigned char channel)
void SelectChannel(struct adapter *padapter, unsigned char channel)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -425,7 +425,7 @@ void SelectChannel(_adapter *padapter, unsigned char channel)
rtw_hal_set_chan(padapter, channel);
}
void SetBWMode(_adapter *padapter, unsigned short bwmode, unsigned char channel_offset)
void SetBWMode(struct adapter *padapter, unsigned short bwmode, unsigned char channel_offset)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -436,7 +436,7 @@ void SetBWMode(_adapter *padapter, unsigned short bwmode, unsigned char channel_
rtw_hal_set_bwmode(padapter, (enum ht_channel_width)bwmode, channel_offset);
}
void set_channel_bwmode(_adapter *padapter, unsigned char channel, unsigned char channel_offset, unsigned short bwmode)
void set_channel_bwmode(struct adapter *padapter, unsigned char channel, unsigned char channel_offset, unsigned short bwmode)
{
u8 center_ch;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -506,7 +506,7 @@ u16 get_beacon_interval(struct wlan_bssid_ex *bss)
}
int is_client_associated_to_ap(_adapter *padapter)
int is_client_associated_to_ap(struct adapter *padapter)
{
struct mlme_ext_priv *pmlmeext;
struct mlme_ext_info *pmlmeinfo;
@ -527,7 +527,7 @@ int is_client_associated_to_ap(_adapter *padapter)
}
}
int is_client_associated_to_ibss(_adapter *padapter)
int is_client_associated_to_ibss(struct adapter *padapter)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -542,7 +542,7 @@ int is_client_associated_to_ibss(_adapter *padapter)
}
}
int is_IBSS_empty(_adapter *padapter)
int is_IBSS_empty(struct adapter *padapter)
{
unsigned int i;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -577,19 +577,19 @@ unsigned int decide_wait_for_beacon_timeout(unsigned int bcn_interval)
}
void CAM_empty_entry(
PADAPTER Adapter,
struct adapter * Adapter,
u8 ucIndex
)
{
rtw_hal_set_hwreg(Adapter, HW_VAR_CAM_EMPTY_ENTRY, (u8 *)(&ucIndex));
}
void invalidate_cam_all(_adapter *padapter)
void invalidate_cam_all(struct adapter *padapter)
{
rtw_hal_set_hwreg(padapter, HW_VAR_CAM_INVALID_ALL, NULL);
}
void write_cam(_adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 *key)
void write_cam(struct adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 *key)
{
unsigned int i, val, addr;
int j;
@ -632,7 +632,7 @@ void write_cam(_adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 *key)
}
void clear_cam_entry(_adapter *padapter, u8 entry)
void clear_cam_entry(struct adapter *padapter, u8 entry)
{
unsigned char null_sta[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
unsigned char null_key[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,0x00, 0x00, 0x00, 0x00,0x00, 0x00, 0x00, 0x00};
@ -640,7 +640,7 @@ void clear_cam_entry(_adapter *padapter, u8 entry)
write_cam(padapter, entry, 0, null_sta, null_key);
}
int allocate_fw_sta_entry(_adapter *padapter)
int allocate_fw_sta_entry(struct adapter *padapter)
{
unsigned int mac_id;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -659,7 +659,7 @@ int allocate_fw_sta_entry(_adapter *padapter)
return mac_id;
}
void flush_all_cam_entry(_adapter *padapter)
void flush_all_cam_entry(struct adapter *padapter)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -669,7 +669,7 @@ void flush_all_cam_entry(_adapter *padapter)
_rtw_memset((u8 *)(pmlmeinfo->FW_sta_info), 0, sizeof(pmlmeinfo->FW_sta_info));
}
int WMM_param_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE)
int WMM_param_handler(struct adapter *padapter, struct ndis_802_11_var_ie * pIE)
{
/* struct registry_priv *pregpriv = &padapter->registrypriv; */
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -687,7 +687,7 @@ int WMM_param_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE)
return true;
}
void WMMOnAssocRsp(_adapter *padapter)
void WMMOnAssocRsp(struct adapter *padapter)
{
u8 ACI, ACM, AIFS, ECWMin, ECWMax, aSifsTime;
u8 acm_mask;
@ -805,7 +805,7 @@ void WMMOnAssocRsp(_adapter *padapter)
return;
}
static void bwmode_update_check(_adapter *padapter, struct ndis_802_11_var_ie * pIE)
static void bwmode_update_check(struct adapter *padapter, struct ndis_802_11_var_ie * pIE)
{
#ifdef CONFIG_80211N_HT
unsigned char new_bwmode;
@ -900,7 +900,7 @@ static void bwmode_update_check(_adapter *padapter, struct ndis_802_11_var_ie *
#endif /* CONFIG_80211N_HT */
}
void HT_caps_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE)
void HT_caps_handler(struct adapter *padapter, struct ndis_802_11_var_ie * pIE)
{
#ifdef CONFIG_80211N_HT
unsigned int i;
@ -964,7 +964,7 @@ void HT_caps_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE)
return;
}
void HT_info_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE)
void HT_info_handler(struct adapter *padapter, struct ndis_802_11_var_ie * pIE)
{
#ifdef CONFIG_80211N_HT
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -986,7 +986,7 @@ void HT_info_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE)
return;
}
void HTOnAssocRsp(_adapter *padapter)
void HTOnAssocRsp(struct adapter *padapter)
{
unsigned char max_AMPDU_len;
unsigned char min_MPDU_spacing;
@ -1021,7 +1021,7 @@ void HTOnAssocRsp(_adapter *padapter)
rtw_hal_set_hwreg(padapter, HW_VAR_AMPDU_FACTOR, (u8 *)(&max_AMPDU_len));
}
void ERP_IE_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE)
void ERP_IE_handler(struct adapter *padapter, struct ndis_802_11_var_ie * pIE)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -1033,7 +1033,7 @@ void ERP_IE_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE)
_rtw_memcpy(&(pmlmeinfo->ERP_IE), pIE->data, pIE->Length);
}
void VCS_update(_adapter *padapter, struct sta_info *psta)
void VCS_update(struct adapter *padapter, struct sta_info *psta)
{
struct registry_priv *pregpriv = &padapter->registrypriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -1083,7 +1083,7 @@ void VCS_update(_adapter *padapter, struct sta_info *psta)
}
}
int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)
{
unsigned int len;
unsigned char *p;
@ -1292,7 +1292,7 @@ _mismatch:
_func_exit_;
}
void update_beacon_info(_adapter *padapter, u8 *pframe, uint pkt_len, struct sta_info *psta)
void update_beacon_info(struct adapter *padapter, u8 *pframe, uint pkt_len, struct sta_info *psta)
{
unsigned int i;
unsigned int len;
@ -1323,7 +1323,7 @@ void update_beacon_info(_adapter *padapter, u8 *pframe, uint pkt_len, struct sta
}
}
unsigned int is_ap_in_tkip(_adapter *padapter)
unsigned int is_ap_in_tkip(struct adapter *padapter)
{
u32 i;
struct ndis_802_11_var_ie * pIE;
@ -1368,7 +1368,7 @@ unsigned int is_ap_in_tkip(_adapter *padapter)
}
unsigned int should_forbid_n_rate(_adapter * padapter)
unsigned int should_forbid_n_rate(struct adapter * padapter)
{
u32 i;
struct ndis_802_11_var_ie * pIE;
@ -1412,7 +1412,7 @@ unsigned int should_forbid_n_rate(_adapter * padapter)
}
unsigned int is_ap_in_wep(_adapter *padapter)
unsigned int is_ap_in_wep(struct adapter *padapter)
{
u32 i;
struct ndis_802_11_var_ie * pIE;
@ -1552,7 +1552,7 @@ unsigned int update_MSC_rate(struct HT_caps_element *pHT_caps)
return mask;
}
int support_short_GI(_adapter *padapter, struct HT_caps_element *pHT_caps)
int support_short_GI(struct adapter *padapter, struct HT_caps_element *pHT_caps)
{
unsigned char bit_offset;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -1607,25 +1607,25 @@ unsigned char get_highest_mcs_rate(struct HT_caps_element *pHT_caps)
return i;
}
void Update_RA_Entry(_adapter *padapter, u32 mac_id)
void Update_RA_Entry(struct adapter *padapter, u32 mac_id)
{
rtw_hal_update_ra_mask(padapter, mac_id,0);
}
void enable_rate_adaptive(_adapter *padapter, u32 mac_id);
void enable_rate_adaptive(_adapter *padapter, u32 mac_id)
void enable_rate_adaptive(struct adapter *padapter, u32 mac_id);
void enable_rate_adaptive(struct adapter *padapter, u32 mac_id)
{
Update_RA_Entry(padapter, mac_id);
}
void set_sta_rate(_adapter *padapter, struct sta_info *psta)
void set_sta_rate(struct adapter *padapter, struct sta_info *psta)
{
/* rate adaptive */
enable_rate_adaptive(padapter, psta->mac_id);
}
/* Update RRSR and Rate for USERATE */
void update_tx_basic_rate(_adapter *padapter, u8 wirelessmode)
void update_tx_basic_rate(struct adapter *padapter, u8 wirelessmode)
{
unsigned char supported_rates[NDIS_802_11_LENGTH_RATES_EX];
#ifdef CONFIG_P2P
@ -1746,7 +1746,7 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)
}
}
void update_IOT_info(_adapter *padapter)
void update_IOT_info(struct adapter *padapter)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -1778,7 +1778,7 @@ void update_IOT_info(_adapter *padapter)
}
void update_capinfo(PADAPTER Adapter, u16 updateCap)
void update_capinfo(struct adapter * Adapter, u16 updateCap)
{
struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -1848,7 +1848,7 @@ void update_capinfo(PADAPTER Adapter, u16 updateCap)
}
void update_wireless_mode(_adapter *padapter)
void update_wireless_mode(struct adapter *padapter)
{
int ratelen, network_type = 0;
u32 SIFS_Timer;
@ -1905,7 +1905,7 @@ void update_wireless_mode(_adapter *padapter)
update_mgnt_tx_rate(padapter, IEEE80211_OFDM_RATE_6MB);
}
void update_bmc_sta_support_rate(_adapter *padapter, u32 mac_id)
void update_bmc_sta_support_rate(struct adapter *padapter, u32 mac_id)
{
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -1921,7 +1921,7 @@ void update_bmc_sta_support_rate(_adapter *padapter, u32 mac_id)
}
}
int update_sta_support_rate(_adapter *padapter, u8* pvar_ie, uint var_ie_len, int cam_idx)
int update_sta_support_rate(struct adapter *padapter, u8* pvar_ie, uint var_ie_len, int cam_idx)
{
unsigned int ie_len;
struct ndis_802_11_var_ie * pIE;
@ -1948,7 +1948,7 @@ int update_sta_support_rate(_adapter *padapter, u8* pvar_ie, uint var_ie_len, in
}
void process_addba_req(_adapter *padapter, u8 *paddba_req, u8 *addr)
void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addr)
{
struct sta_info *psta;
u16 tid;
@ -1985,19 +1985,19 @@ void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len)
pmlmeext->TSFValue |= le32_to_cpu(*pbuf);
}
void correct_TSF(_adapter *padapter, struct mlme_ext_priv *pmlmeext)
void correct_TSF(struct adapter *padapter, struct mlme_ext_priv *pmlmeext)
{
rtw_hal_set_hwreg(padapter, HW_VAR_CORRECT_TSF, NULL);
}
void beacon_timing_control(_adapter *padapter)
void beacon_timing_control(struct adapter *padapter)
{
rtw_hal_bcn_related_reg_setting(padapter);
}
static _adapter *pbuddy_padapter = NULL;
static struct adapter *pbuddy_padapter = NULL;
int rtw_handle_dualmac(_adapter *adapter, bool init)
int rtw_handle_dualmac(struct adapter *adapter, bool init)
{
int status = _SUCCESS;
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);

58
core/rtw_xmit.c
View file

@ -65,7 +65,7 @@ _func_exit_;
}
s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, _adapter *padapter)
s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
{
int i;
struct xmit_buf *pxmitbuf;
@ -277,7 +277,7 @@ void rtw_mfree_xmit_priv_lock (struct xmit_priv *pxmitpriv)
void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv)
{
int i;
_adapter *padapter = pxmitpriv->adapter;
struct adapter *padapter = pxmitpriv->adapter;
struct xmit_frame *pxmitframe = (struct xmit_frame*) pxmitpriv->pxmit_frame_buf;
struct xmit_buf *pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf;
u32 max_xmit_extbuf_size = MAX_XMIT_EXTBUF_SZ;
@ -345,7 +345,7 @@ out:
_func_exit_;
}
static void update_attrib_vcs_info(_adapter *padapter, struct xmit_frame *pxmitframe)
static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame *pxmitframe)
{
u32 sz;
struct pkt_attrib *pattrib = &pxmitframe->attrib;
@ -534,7 +534,7 @@ static void set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib)
pattrib->subtype = WIFI_QOS_DATA_TYPE;
}
static s32 update_attrib(_adapter *padapter, struct sk_buff *pkt, struct pkt_attrib *pattrib)
static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct pkt_attrib *pattrib)
{
struct pkt_file pktfile;
struct sta_info *psta = NULL;
@ -763,7 +763,7 @@ _func_exit_;
return res;
}
static s32 xmitframe_addmic(_adapter *padapter, struct xmit_frame *pxmitframe){
static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitframe){
int curfragnum,length;
u8 *pframe, *payload,mic[8];
struct mic_data micdata;
@ -891,7 +891,7 @@ _func_exit_;
return _SUCCESS;
}
static s32 xmitframe_swencrypt(_adapter *padapter, struct xmit_frame *pxmitframe){
static s32 xmitframe_swencrypt(struct adapter *padapter, struct xmit_frame *pxmitframe){
struct pkt_attrib *pattrib = &pxmitframe->attrib;
/* struct security_priv *psecuritypriv=&padapter->securitypriv; */
@ -927,7 +927,7 @@ _func_exit_;
return _SUCCESS;
}
s32 rtw_make_wlanhdr (_adapter *padapter , u8 *hdr, struct pkt_attrib *pattrib)
s32 rtw_make_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pattrib)
{
u16 *qc;
@ -1073,7 +1073,7 @@ _func_exit_;
return res;
}
s32 rtw_txframes_pending(_adapter *padapter)
s32 rtw_txframes_pending(struct adapter *padapter)
{
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -1083,7 +1083,7 @@ s32 rtw_txframes_pending(_adapter *padapter)
(_rtw_queue_empty(&pxmitpriv->vo_pending) == false));
}
s32 rtw_txframes_sta_ac_pending(_adapter *padapter, struct pkt_attrib *pattrib)
s32 rtw_txframes_sta_ac_pending(struct adapter *padapter, struct pkt_attrib *pattrib)
{
struct sta_info *psta;
struct tx_servq *ptxservq;
@ -1145,7 +1145,7 @@ This sub-routine will perform all the following:
6. apply sw-encrypt, if necessary.
*/
s32 rtw_xmitframe_coalesce(_adapter *padapter, struct sk_buff *pkt, struct xmit_frame *pxmitframe)
s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct xmit_frame *pxmitframe)
{
struct pkt_file pktfile;
@ -1364,7 +1364,7 @@ _func_exit_;
return SNAP_SIZE + sizeof(u16);
}
void rtw_update_protection(_adapter *padapter, u8 *ie, uint ie_len)
void rtw_update_protection(struct adapter *padapter, u8 *ie, uint ie_len)
{
uint protection;
@ -1413,7 +1413,7 @@ _func_exit_;
}
void rtw_count_tx_stats(PADAPTER padapter, struct xmit_frame *pxmitframe, int sz)
void rtw_count_tx_stats(struct adapter * padapter, struct xmit_frame *pxmitframe, int sz)
{
struct sta_info *psta = NULL;
struct stainfo_stats *pstats = NULL;
@ -1612,7 +1612,7 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)/* _queue *pf
struct xmit_frame *pxframe = NULL;
struct list_head *plist, *phead;
struct __queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue;
_adapter *padapter = pxmitpriv->adapter;
struct adapter *padapter = pxmitpriv->adapter;
_func_enter_;
@ -1663,7 +1663,7 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram
{
unsigned long irqL;
struct __queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue;
_adapter *padapter = pxmitpriv->adapter;
struct adapter *padapter = pxmitpriv->adapter;
struct sk_buff *pndis_pkt = NULL;
_func_enter_;
@ -1728,7 +1728,7 @@ _func_enter_;
_func_exit_;
}
s32 rtw_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe)
s32 rtw_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe)
{
if (rtw_xmit_classifier(padapter, pxmitframe) == _FAIL)
{
@ -1776,7 +1776,7 @@ struct xmit_frame* rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmi
struct tx_servq *ptxservq = NULL;
struct __queue *pframe_queue = NULL;
struct xmit_frame *pxmitframe = NULL;
_adapter *padapter = pxmitpriv->adapter;
struct adapter *padapter = pxmitpriv->adapter;
struct registry_priv *pregpriv = &padapter->registrypriv;
int i, inx[4];
@ -1831,7 +1831,7 @@ _func_exit_;
}
#if 1
struct tx_servq *rtw_get_sta_pending(_adapter *padapter, struct sta_info *psta, int up, u8 *ac)
struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info *psta, int up, u8 *ac)
{
struct tx_servq *ptxservq;
@ -1876,7 +1876,7 @@ _func_exit_;
}
#else
__inline static struct tx_servq *rtw_get_sta_pending
(_adapter *padapter, struct __queue **ppstapending, struct sta_info *psta, int up)
(struct adapter *padapter, struct __queue **ppstapending, struct sta_info *psta, int up)
{
struct tx_servq *ptxservq;
struct hw_xmit *phwxmits = padapter->xmitpriv.hwxmits;
@ -1926,7 +1926,7 @@ _func_exit_;
* Will enqueue pxmitframe to the proper queue,
* and indicate it to xx_pending list.....
*/
s32 rtw_xmit_classifier(_adapter *padapter, struct xmit_frame *pxmitframe)
s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe)
{
/* unsigned long irqL0; */
u8 ac_index;
@ -1967,7 +1967,7 @@ _func_exit_;
return res;
}
void rtw_alloc_hwxmits(_adapter *padapter)
void rtw_alloc_hwxmits(struct adapter *padapter)
{
struct hw_xmit *hwxmits;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -2029,7 +2029,7 @@ void rtw_alloc_hwxmits(_adapter *padapter)
}
void rtw_free_hwxmits(_adapter *padapter)
void rtw_free_hwxmits(struct adapter *padapter)
{
struct hw_xmit *hwxmits;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -2048,7 +2048,7 @@ _func_enter_;
_func_exit_;
}
static int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb)
static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb)
{
struct sk_buff *skb = *pskb;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -2231,7 +2231,7 @@ u32 rtw_get_ff_hwaddr(struct xmit_frame *pxmitframe)
}
static void do_queue_select(_adapter *padapter, struct pkt_attrib *pattrib)
static void do_queue_select(struct adapter *padapter, struct pkt_attrib *pattrib)
{
u8 qsel;
@ -2249,7 +2249,7 @@ static void do_queue_select(_adapter *padapter, struct pkt_attrib *pattrib)
* 0 success, hardware will handle this xmit frame(packet)
* <0 fail
*/
s32 rtw_xmit(_adapter *padapter, struct sk_buff **ppkt)
s32 rtw_xmit(struct adapter *padapter, struct sk_buff **ppkt)
{
#ifdef CONFIG_AP_MODE
unsigned long irqL0;
@ -2316,7 +2316,7 @@ s32 rtw_xmit(_adapter *padapter, struct sk_buff **ppkt)
#if defined(CONFIG_AP_MODE)
int xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *pxmitframe)
int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_frame *pxmitframe)
{
unsigned long irqL;
int ret=false;
@ -2447,7 +2447,7 @@ int xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *px
}
static void dequeue_xmitframes_to_sleeping_queue(_adapter *padapter, struct sta_info *psta, struct __queue *pframequeue)
static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struct sta_info *psta, struct __queue *pframequeue)
{
struct list_head *plist, *phead;
u8 ac_index;
@ -2477,7 +2477,7 @@ static void dequeue_xmitframes_to_sleeping_queue(_adapter *padapter, struct sta_
}
void stop_sta_xmit(_adapter *padapter, struct sta_info *psta)
void stop_sta_xmit(struct adapter *padapter, struct sta_info *psta)
{
unsigned long irqL0;
struct sta_info *psta_bmc;
@ -2520,7 +2520,7 @@ void stop_sta_xmit(_adapter *padapter, struct sta_info *psta)
_exit_critical_bh(&pxmitpriv->lock, &irqL0);
}
void wakeup_sta_to_xmit(_adapter *padapter, struct sta_info *psta)
void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta)
{
unsigned long irqL;
u8 update_mask=0, wmmps_ac=0;
@ -2679,7 +2679,7 @@ void wakeup_sta_to_xmit(_adapter *padapter, struct sta_info *psta)
}
void xmit_delivery_enabled_frames(_adapter *padapter, struct sta_info *psta)
void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *psta)
{
unsigned long irqL;
u8 wmmps_ac=0;