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

rtl8192eu: Replace typedefs for struct adapter

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2014-12-17 17:13:53 -06:00
parent a8b7b4d54c
commit 202d20077c
140 changed files with 3132 additions and 7948 deletions
Download patch file Download diff file Expand all files Collapse all files

80
core/rtw_ap.c
View file

@ -33,7 +33,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);
@ -51,7 +51,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)
{
_irqL irqL;
struct sta_info *psta=NULL;
@ -81,7 +81,7 @@ void free_mlme_ap_info(_adapter *padapter)
}
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);
@ -203,7 +203,7 @@ static void update_BCNTIM(_adapter *padapter)
}
void rtw_add_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *data, u8 len)
void rtw_add_bcn_ie(struct adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *data, u8 len)
{
PNDIS_802_11_VARIABLE_IEs pIE;
u8 bmatch = _FALSE;
@ -273,7 +273,7 @@ void rtw_add_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *d
pnetwork->IELength = offset + remainder_ielen;
}
void rtw_remove_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index)
void rtw_remove_bcn_ie(struct adapter *padapter, 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;
@ -351,7 +351,7 @@ u8 chk_sta_is_alive(struct sta_info *psta)
return ret;
}
void expire_timeout_chk(_adapter *padapter)
void expire_timeout_chk(struct adapter *padapter)
{
_irqL irqL;
_list *phead, *plist;
@ -603,7 +603,7 @@ if (chk_alive_num) {
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;
@ -832,7 +832,7 @@ void add_RATid(_adapter *padapter, struct sta_info *psta, u8 rssi_level)
}
void update_bmc_sta(_adapter *padapter)
void update_bmc_sta(struct adapter *padapter)
{
_irqL irqL;
u32 init_rate=0;
@ -943,7 +943,7 @@ 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)
{
_irqL irqL;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -1032,7 +1032,7 @@ void update_sta_info_apmode(_adapter *padapter, struct sta_info *psta)
}
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;
@ -1078,7 +1078,7 @@ static void update_hw_ht_param(_adapter *padapter)
}
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;
@ -1186,7 +1186,7 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf)
{
if(rtw_buddy_adapter_up(padapter))
{
_adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
//turn on all dynamic functions on PRIMARY_ADAPTER, dynamic functions only runs at PRIMARY_ADAPTER
Switch_DM_Func(pbuddy_adapter, DYNAMIC_ALL_FUNC_ENABLE, _TRUE);
@ -1250,7 +1250,7 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf)
}
else if(check_buddy_fwstate(padapter, _FW_LINKED)==_TRUE)//only second adapter can enter AP Mode
{
_adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
//To sync cur_channel/cur_bwmode/cur_ch_offset with primary adapter
@ -1374,7 +1374,7 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf)
}
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;
@ -1783,7 +1783,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;
@ -1793,7 +1793,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)
{
_irqL irqL;
_list *plist, *phead;
@ -1867,7 +1867,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)
{
_irqL irqL;
_list *plist, *phead;
@ -1912,13 +1912,13 @@ int rtw_acl_remove_sta(_adapter *padapter, u8 *addr)
#ifdef CONFIG_NATIVEAP_MLME
static void update_bcn_fixed_ie(_adapter *padapter)
static void update_bcn_fixed_ie(struct adapter *padapter)
{
DBG_871X("%s\n", __FUNCTION__);
}
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);
@ -1953,37 +1953,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_871X("%s\n", __FUNCTION__);
}
static void update_bcn_htinfo_ie(_adapter *padapter)
static void update_bcn_htinfo_ie(struct adapter *padapter)
{
DBG_871X("%s\n", __FUNCTION__);
}
static void update_bcn_rsn_ie(_adapter *padapter)
static void update_bcn_rsn_ie(struct adapter *padapter)
{
DBG_871X("%s\n", __FUNCTION__);
}
static void update_bcn_wpa_ie(_adapter *padapter)
static void update_bcn_wpa_ie(struct adapter *padapter)
{
DBG_871X("%s\n", __FUNCTION__);
}
static void update_bcn_wmm_ie(_adapter *padapter)
static void update_bcn_wmm_ie(struct adapter *padapter)
{
DBG_871X("%s\n", __FUNCTION__);
}
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;
@ -2039,12 +2039,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_871X("%s\n", __FUNCTION__);
@ -2072,7 +2072,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)
{
_irqL irqL;
struct mlme_priv *pmlmepriv;
@ -2175,7 +2175,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;
@ -2248,7 +2248,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)
@ -2280,7 +2280,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);
@ -2488,7 +2488,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);
@ -2563,7 +2563,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)
{
_irqL irqL;
u8 beacon_updated = _FALSE;
@ -2631,7 +2631,7 @@ u8 ap_free_sta(_adapter *padapter, struct sta_info *psta, bool active, u16 reaso
}
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)
{
_irqL irqL;
_list *phead, *plist;
@ -2668,7 +2668,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)
{
_irqL irqL;
_list *phead, *plist;
@ -2725,7 +2725,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);
@ -2764,7 +2764,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)
{
@ -2773,7 +2773,7 @@ void ap_sta_info_defer_update(_adapter *padapter, struct sta_info *psta)
}
}
/* restore hw setting from sw data structures */
void rtw_ap_restore_network(_adapter *padapter)
void rtw_ap_restore_network(struct adapter *padapter)
{
struct mlme_priv *mlmepriv = &padapter->mlmepriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -2840,7 +2840,7 @@ void rtw_ap_restore_network(_adapter *padapter)
}
void start_ap_mode(_adapter *padapter)
void start_ap_mode(struct adapter *padapter)
{
int i;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -2896,7 +2896,7 @@ void start_ap_mode(_adapter *padapter)
}
void stop_ap_mode(_adapter *padapter)
void stop_ap_mode(struct adapter *padapter)
{
_irqL irqL;
_list *phead, *plist;

58
core/rtw_br_ext.c
View file

@ -142,7 +142,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;
@ -152,7 +152,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)))
@ -389,7 +389,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!
@ -422,7 +422,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;
@ -499,7 +499,7 @@ static int __nat25_db_network_lookup_and_replace(_adapter *priv,
}
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;
@ -539,7 +539,7 @@ static void __nat25_db_network_insert(_adapter *priv,
}
static void __nat25_db_print(_adapter *priv)
static void __nat25_db_print(struct adapter *priv)
{
_irqL irqL;
_enter_critical_bh(&priv->br_ext_lock, &irqL);
@ -628,7 +628,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;
_irqL irqL;
@ -659,7 +659,7 @@ void nat25_db_cleanup(_adapter *priv)
}
void nat25_db_expire(_adapter *priv)
void nat25_db_expire(struct adapter *priv)
{
int i;
_irqL irqL;
@ -753,7 +753,7 @@ void nat25_db_expire(_adapter *priv)
#ifdef SUPPORT_TX_MCAST2UNI
static int checkIPMcAndReplace(_adapter *priv, struct sk_buff *skb, unsigned int *dst_ip)
static int checkIPMcAndReplace(struct adapter *priv, struct sk_buff *skb, unsigned int *dst_ip)
{
struct stat_info *pstat;
struct list_head *phead, *plist;
@ -780,7 +780,7 @@ static int checkIPMcAndReplace(_adapter *priv, struct sk_buff *skb, unsigned int
}
#endif
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];
@ -1484,7 +1484,7 @@ int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method)
}
int nat25_handle_frame(_adapter *priv, struct sk_buff *skb)
int nat25_handle_frame(struct adapter *priv, struct sk_buff *skb)
{
#ifdef BR_EXT_DEBUG
if((!priv->ethBrExtInfo.nat25_disable) && (!(skb->data[0] & 1)))
@ -1567,38 +1567,6 @@ int nat25_handle_frame(_adapter *priv, struct sk_buff *skb)
return 0;
}
#if 0
void mac_clone(_adapter *priv, unsigned char *addr)
{
struct sockaddr sa;
memcpy(sa.sa_data, addr, ETH_ALEN);
DEBUG_INFO("MAC Clone: Addr=%02x%02x%02x%02x%02x%02x\n",
addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
rtl8192cd_set_hwaddr(priv->dev, &sa);
}
int mac_clone_handle_frame(_adapter *priv, struct sk_buff *skb)
{
if(priv->ethBrExtInfo.macclone_enable && !priv->macclone_completed)
{
if(!(skb->data[ETH_ALEN] & 1)) //// check any other particular MAC add
{
if(memcmp(skb->data+ETH_ALEN, GET_MY_HWADDR(priv), ETH_ALEN) &&
((priv->dev->br_port) &&
memcmp(skb->data+ETH_ALEN, priv->br_mac, ETH_ALEN)))
{
mac_clone(priv, skb->data+ETH_ALEN);
priv->macclone_completed = 1;
}
}
}
return 0;
}
#endif // 0
#define SERVER_PORT 67
#define CLIENT_PORT 68
#define DHCP_MAGIC 0x63825363
@ -1623,7 +1591,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;
@ -1670,7 +1638,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];

136
core/rtw_cmd.c
View file

@ -349,7 +349,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_;
@ -428,7 +428,7 @@ _func_exit_;
}
void rtw_stop_cmd_thread(_adapter *adapter)
void rtw_stop_cmd_thread(struct adapter *adapter)
{
if(adapter->cmdThread && adapter->cmdpriv.cmdthd_running == _TRUE
&& adapter->cmdpriv.stop_req == 0)
@ -444,9 +444,9 @@ thread_return rtw_cmd_thread(thread_context context)
u8 ret;
struct cmd_obj *pcmd;
u8 *pcmdbuf, *prspbuf;
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_;
@ -677,7 +677,7 @@ _func_exit_;
/*
u8 rtw_setstandby_cmd(unsigned char *adapter)
*/
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;
@ -718,7 +718,7 @@ rtw_sitesurvey_cmd(~)
### NOTE:#### (!!!!)
MUST TAKE CARE THAT BEFORE CALLING THIS FUNC, YOU SHOULD HAVE LOCKED pmlmepriv->lock
*/
u8 rtw_sitesurvey_cmd(_adapter *padapter, NDIS_802_11_SSID *ssid, int ssid_num,
u8 rtw_sitesurvey_cmd(struct adapter *padapter, NDIS_802_11_SSID *ssid, int ssid_num,
struct rtw_ieee80211_channel *ch, int ch_num)
{
u8 res = _FAIL;
@ -818,7 +818,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;
@ -856,7 +856,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;
@ -898,7 +898,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;
@ -935,7 +935,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;
@ -966,7 +966,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;
@ -1001,7 +1001,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;
@ -1032,7 +1032,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;
@ -1072,7 +1072,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_;
@ -1083,7 +1083,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_;
@ -1093,7 +1093,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;
@ -1135,7 +1135,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;
@ -1165,7 +1165,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 *auth, res = _SUCCESS;
uint t_len = 0;
@ -1349,7 +1349,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;
@ -1392,7 +1392,7 @@ _func_exit_;
return res;
}
u8 rtw_setopmode_cmd(_adapter *padapter, NDIS_802_11_NETWORK_INFRASTRUCTURE networktype, bool enqueue)
u8 rtw_setopmode_cmd(struct adapter *padapter, NDIS_802_11_NETWORK_INFRASTRUCTURE networktype, bool enqueue)
{
struct cmd_obj* ph2c;
struct setopmode_parm* psetop;
@ -1431,7 +1431,7 @@ _func_exit_;
return res;
}
u8 rtw_setstakey_cmd(_adapter *padapter, u8 *psta, u8 unicast_key, bool enqueue)
u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key, bool enqueue)
{
struct cmd_obj* ph2c;
struct set_stakey_parm *psetstakey_para;
@ -1512,7 +1512,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;
@ -1573,7 +1573,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;
@ -1605,7 +1605,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;
@ -1644,7 +1644,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;
@ -1690,7 +1690,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;
@ -1730,7 +1730,7 @@ _func_exit_;
return res;
}
//add for CONFIG_IEEE80211W, none 11w can use it
u8 rtw_reset_securitypriv_cmd(_adapter*padapter)
u8 rtw_reset_securitypriv_cmd(struct adapter*padapter)
{
struct cmd_obj* ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -1770,7 +1770,7 @@ _func_exit_;
}
u8 rtw_free_assoc_resources_cmd(_adapter*padapter)
u8 rtw_free_assoc_resources_cmd(struct adapter*padapter)
{
struct cmd_obj* ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -1810,7 +1810,7 @@ _func_exit_;
}
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;
@ -1855,7 +1855,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;
@ -1910,7 +1910,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;
@ -1969,7 +1969,7 @@ _func_exit_;
return res;
}
u8 rtw_led_blink_cmd(_adapter*padapter, PLED_871x pLed)
u8 rtw_led_blink_cmd(struct adapter*padapter, PLED_871x pLed)
{
struct cmd_obj* pcmdobj;
struct LedBlink_param *ledBlink_param;
@ -2006,7 +2006,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;
@ -2044,7 +2044,7 @@ _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)
{
struct cmd_obj* pcmdobj;
struct TDLSoption_param *TDLSoption;
@ -2090,7 +2090,7 @@ _func_exit_;
}
#ifdef CONFIG_DETECT_C2H_BY_POLLING
u8 rtw_event_polling_cmd(_adapter*padapter)
u8 rtw_event_polling_cmd(struct adapter*padapter)
{
struct cmd_obj* ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -2137,7 +2137,7 @@ exit:
}
#endif
static void traffic_status_watchdog(_adapter *padapter)
static void traffic_status_watchdog(struct adapter *padapter)
{
#ifdef CONFIG_LPS
u8 bEnterPS;
@ -2276,12 +2276,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_ACTIVE_KEEP_ALIVE_CHECK
@ -2317,8 +2317,8 @@ void dynamic_chk_wk_hdl(_adapter *padapter, u8 *pbuf, int sz)
#ifdef CONFIG_LPS
void lps_ctrl_wk_hdl(_adapter *padapter, u8 lps_ctrl_type);
void lps_ctrl_wk_hdl(_adapter *padapter, u8 lps_ctrl_type)
void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type);
void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
{
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -2402,7 +2402,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;
@ -2459,12 +2459,12 @@ _func_exit_;
#endif
#if (RATE_ADAPTIVE_SUPPORT==1)
void rpt_timer_setting_wk_hdl(_adapter *padapter, u16 minRptTime)
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;
@ -2502,12 +2502,12 @@ _func_exit_;
#endif
#ifdef CONFIG_ANTENNA_DIVERSITY
void antenna_select_wk_hdl(_adapter *padapter, u8 antenna)
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;
@ -2553,25 +2553,25 @@ _func_exit_;
}
#endif
void power_saving_wk_hdl(_adapter *padapter, u8 *pbuf, int sz);
void power_saving_wk_hdl(_adapter *padapter, u8 *pbuf, int sz)
void power_saving_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz);
void power_saving_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz)
{
rtw_ps_processor(padapter);
}
//add for CONFIG_IEEE80211W, none 11w can use it
void reset_securitypriv_hdl(_adapter *padapter)
void reset_securitypriv_hdl(struct adapter *padapter)
{
rtw_reset_securitypriv(padapter);
}
void free_assoc_resources_hdl(_adapter *padapter)
void free_assoc_resources_hdl(struct adapter *padapter)
{
rtw_free_assoc_resources(padapter, 1);
}
#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;
@ -2616,7 +2616,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;
@ -2659,7 +2659,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;
@ -2706,7 +2706,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;
@ -2741,7 +2741,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;
@ -2774,7 +2774,7 @@ exit:
return res;
}
s32 c2h_evt_hdl(_adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter)
s32 c2h_evt_hdl(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter)
{
s32 ret = _FAIL;
u8 buf[16];
@ -2804,7 +2804,7 @@ exit:
static void c2h_wk_callback(_workitem *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);
@ -2844,7 +2844,7 @@ static void c2h_wk_callback(_workitem *work)
#endif
#ifdef CONFIG_DETECT_C2H_BY_POLLING
void event_polling_hdl(_adapter *padapter, u8 *pbuf, int sz)
void event_polling_hdl(struct adapter *padapter, u8 *pbuf, int sz)
{
c2h_id_filter ccx_id_filter = rtw_hal_c2h_id_filter_ccx(padapter);
u8 check_c2hcmd, check_ccx;
@ -2888,7 +2888,7 @@ void event_polling_hdl(_adapter *padapter, u8 *pbuf, int sz)
}
#endif
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;
@ -2967,7 +2967,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;
@ -2989,7 +2989,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)
{
_irqL irqL;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -3020,7 +3020,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;
@ -3043,7 +3043,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)
{
_irqL irqL;
u8 timer_cancelled;
@ -3170,7 +3170,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;
@ -3194,7 +3194,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)
{
_irqL irqL;
struct sta_priv * pstapriv = &padapter->stapriv;
@ -3227,8 +3227,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_;

92
core/rtw_debug.c
View file

@ -102,7 +102,7 @@ int proc_set_write_reg(struct file *file, const char *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;
@ -151,7 +151,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;
@ -217,7 +217,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;
@ -233,7 +233,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;
@ -251,7 +251,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);
@ -268,7 +268,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;
@ -285,7 +285,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;
@ -301,7 +301,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;
@ -320,7 +320,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);
@ -370,7 +370,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",
@ -387,7 +387,7 @@ int proc_get_trx_info(char *page, char **start,
{
int i;
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;
struct hw_xmit *phwxmit;
@ -420,7 +420,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;
@ -443,7 +443,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;
@ -466,7 +466,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;
@ -489,7 +489,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;
@ -509,7 +509,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;
@ -529,7 +529,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;
@ -549,7 +549,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;
@ -576,7 +576,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;
@ -602,7 +602,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;
@ -629,7 +629,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;
@ -656,7 +656,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;
@ -682,7 +682,7 @@ int proc_set_rx_signal(struct file *file, const char *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, signal_strength;
@ -721,7 +721,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;
@ -740,7 +740,7 @@ int proc_set_ht_enable(struct file *file, const char *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;
@ -768,7 +768,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;
@ -787,7 +787,7 @@ int proc_set_cbw40_enable(struct file *file, const char *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;
@ -817,7 +817,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;
@ -836,7 +836,7 @@ int proc_set_ampdu_enable(struct file *file, const char *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;
@ -866,7 +866,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;
@ -886,7 +886,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;
@ -905,7 +905,7 @@ int proc_set_rx_stbc(struct file *file, const char *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;
@ -942,7 +942,7 @@ int proc_set_rssi_disp(struct file *file, const char *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;
@ -988,7 +988,7 @@ int proc_get_all_sta_info(char *page, char **start,
_irqL 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;
_list *plist, *phead;
@ -1081,7 +1081,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;
@ -1140,7 +1140,7 @@ int proc_set_best_channel(struct file *file, const char *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 mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
char tmp[32];
@ -1171,7 +1171,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;
@ -1190,7 +1190,7 @@ int proc_set_btcoex_dbg(struct file *file, const char *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;
@ -1219,7 +1219,7 @@ int proc_set_btcoex_dbg(struct file *file, const char *buffer,
int proc_get_sreset(char *page, char **start, off_t offset, int count, 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;
@ -1231,7 +1231,7 @@ int proc_get_sreset(char *page, char **start, off_t offset, int count, int *eof,
int proc_set_sreset(struct file *file, const char *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];
s32 trigger_point;
@ -1256,7 +1256,7 @@ int proc_set_sreset(struct file *file, const char *buffer, unsigned long count,
int proc_get_odm_dbg_comp(char *page, char **start, off_t offset, int count, int *eof, void *data)
{
struct net_device *dev = data;
_adapter *adapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *adapter = (struct adapter *)rtw_netdev_priv(dev);
int len = 0;
len += _rtw_odm_dbg_comp_msg(adapter, page, count);
@ -1268,7 +1268,7 @@ int proc_get_odm_dbg_comp(char *page, char **start, off_t offset, int count, int
int proc_set_odm_dbg_comp(struct file *file, const char *buffer, unsigned long count, void *data)
{
struct net_device *dev = (struct net_device *)data;
_adapter *adapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *adapter = (struct adapter *)rtw_netdev_priv(dev);
char tmp[32];
u64 dbg_comp;
@ -1292,7 +1292,7 @@ int proc_set_odm_dbg_comp(struct file *file, const char *buffer, unsigned long c
int proc_get_odm_dbg_level(char *page, char **start, off_t offset, int count, int *eof, void *data)
{
struct net_device *dev = data;
_adapter *adapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *adapter = (struct adapter *)rtw_netdev_priv(dev);
int len = 0;
len += _rtw_odm_dbg_level_msg(adapter, page, count);
@ -1304,7 +1304,7 @@ int proc_get_odm_dbg_level(char *page, char **start, off_t offset, int count, in
int proc_set_odm_dbg_level(struct file *file, const char *buffer, unsigned long count, void *data)
{
struct net_device *dev = (struct net_device *)data;
_adapter *adapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *adapter = (struct adapter *)rtw_netdev_priv(dev);
char tmp[32];
u32 dbg_level;
@ -1328,7 +1328,7 @@ int proc_set_odm_dbg_level(struct file *file, const char *buffer, unsigned long
int proc_get_odm_adaptivity(char *page, char **start, off_t offset, int count, 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 += _rtw_odm_adaptivity_parm_msg(padapter, page, count);
@ -1340,7 +1340,7 @@ int proc_get_odm_adaptivity(char *page, char **start, off_t offset, int count, i
int proc_set_odm_adaptivity(struct file *file, const char *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 TH_L2H_ini;
s8 TH_EDCCA_HL_diff;

88
core/rtw_efuse.c
View file

@ -52,12 +52,12 @@ u8 fakeBTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN]={0};
BOOLEAN
Efuse_Read1ByteFromFakeContent(
IN PADAPTER pAdapter,
IN struct adapter *pAdapter,
IN u16 Offset,
IN OUT u8 *Value );
BOOLEAN
Efuse_Read1ByteFromFakeContent(
IN PADAPTER pAdapter,
IN struct adapter *pAdapter,
IN u16 Offset,
IN OUT u8 *Value )
{
@ -75,12 +75,12 @@ Efuse_Read1ByteFromFakeContent(
BOOLEAN
Efuse_Write1ByteToFakeContent(
IN PADAPTER pAdapter,
IN struct adapter *pAdapter,
IN u16 Offset,
IN u8 Value );
BOOLEAN
Efuse_Write1ByteToFakeContent(
IN PADAPTER pAdapter,
IN struct adapter *pAdapter,
IN u16 Offset,
IN u8 Value )
{
@ -117,7 +117,7 @@ Efuse_Write1ByteToFakeContent(
*---------------------------------------------------------------------------*/
VOID
Efuse_PowerSwitch(
IN PADAPTER pAdapter,
IN struct adapter *pAdapter,
IN u8 bWrite,
IN u8 PwrState)
{
@ -142,7 +142,7 @@ Efuse_PowerSwitch(
*---------------------------------------------------------------------------*/
u16
Efuse_GetCurrentSize(
IN PADAPTER pAdapter,
IN struct adapter * pAdapter,
IN u8 efuseType,
IN BOOLEAN bPseudoTest)
{
@ -178,7 +178,7 @@ Efuse_CalculateWordCnts(IN u8 word_en)
//
VOID
ReadEFuseByte(
PADAPTER Adapter,
struct adapter *Adapter,
u16 _offset,
u8 *pbuf,
IN BOOLEAN bPseudoTest)
@ -246,7 +246,7 @@ ReadEFuseByte(
VOID
efuse_ReadEFuse(
PADAPTER Adapter,
struct adapter *Adapter,
u8 efuseType,
u16 _offset,
u16 _size_byte,
@ -255,7 +255,7 @@ efuse_ReadEFuse(
);
VOID
efuse_ReadEFuse(
PADAPTER Adapter,
struct adapter *Adapter,
u8 efuseType,
u16 _offset,
u16 _size_byte,
@ -268,7 +268,7 @@ efuse_ReadEFuse(
VOID
EFUSE_GetEfuseDefinition(
IN PADAPTER pAdapter,
IN struct adapter *pAdapter,
IN u8 efuseType,
IN u8 type,
OUT void *pOut,
@ -296,7 +296,7 @@ EFUSE_GetEfuseDefinition(
*---------------------------------------------------------------------------*/
u8
EFUSE_Read1Byte(
IN PADAPTER Adapter,
IN struct adapter *Adapter,
IN u16 Address)
{
u8 data;
@ -361,12 +361,12 @@ EFUSE_Read1Byte(
void
EFUSE_Write1Byte(
IN PADAPTER Adapter,
IN struct adapter *Adapter,
IN u16 Address,
IN u8 Value);
void
EFUSE_Write1Byte(
IN PADAPTER Adapter,
IN struct adapter *Adapter,
IN u16 Address,
IN u8 Value)
{
@ -414,7 +414,7 @@ EFUSE_Write1Byte(
/* 11/16/2008 MH Read one byte from real Efuse. */
u8
efuse_OneByteRead(
IN PADAPTER pAdapter,
IN struct adapter *pAdapter,
IN u16 addr,
IN u8 *data,
IN BOOLEAN bPseudoTest)
@ -455,7 +455,7 @@ efuse_OneByteRead(
/* 11/16/2008 MH Write one byte to reald Efuse. */
u8
efuse_OneByteWrite(
IN PADAPTER pAdapter,
IN struct adapter *pAdapter,
IN u16 addr,
IN u8 data,
IN BOOLEAN bPseudoTest)
@ -498,7 +498,7 @@ efuse_OneByteWrite(
}
int
Efuse_PgPacketRead( IN PADAPTER pAdapter,
Efuse_PgPacketRead( IN struct adapter *pAdapter,
IN u8 offset,
IN u8 *data,
IN BOOLEAN bPseudoTest)
@ -511,7 +511,7 @@ Efuse_PgPacketRead( IN PADAPTER pAdapter,
}
int
Efuse_PgPacketWrite(IN PADAPTER pAdapter,
Efuse_PgPacketWrite(IN struct adapter *pAdapter,
IN u8 offset,
IN u8 word_en,
IN u8 *data,
@ -526,7 +526,7 @@ Efuse_PgPacketWrite(IN PADAPTER pAdapter,
int
Efuse_PgPacketWrite_BT(IN PADAPTER pAdapter,
Efuse_PgPacketWrite_BT(IN struct adapter *pAdapter,
IN u8 offset,
IN u8 word_en,
IN u8 *data,
@ -585,7 +585,7 @@ efuse_WordEnableDataRead(IN u8 word_en,
u8
Efuse_WordEnableDataWrite( IN PADAPTER pAdapter,
Efuse_WordEnableDataWrite( IN struct adapter *pAdapter,
IN u16 efuse_addr,
IN u8 word_en,
IN u8 *data,
@ -598,12 +598,12 @@ Efuse_WordEnableDataWrite( IN 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);
}
@ -611,12 +611,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, (PVOID)&real_content_len, _FALSE);
EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE);
@ -649,14 +649,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, (PVOID)&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);
@ -665,7 +665,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;
@ -683,7 +683,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;
@ -701,7 +701,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;
@ -799,7 +799,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;
@ -916,13 +916,13 @@ exit:
*---------------------------------------------------------------------------*/
VOID
Efuse_ReadAllMap(
IN PADAPTER pAdapter,
IN struct adapter *pAdapter,
IN u8 efuseType,
IN OUT u8 *Efuse,
IN BOOLEAN bPseudoTest);
VOID
Efuse_ReadAllMap(
IN PADAPTER pAdapter,
IN struct adapter *pAdapter,
IN u8 efuseType,
IN OUT u8 *Efuse,
IN BOOLEAN bPseudoTest)
@ -958,7 +958,7 @@ Efuse_ReadAllMap(
*---------------------------------------------------------------------------*/
static VOID
efuse_ShadowRead1Byte(
IN PADAPTER pAdapter,
IN struct adapter *pAdapter,
IN u16 Offset,
IN OUT u8 *Value)
{
@ -971,7 +971,7 @@ efuse_ShadowRead1Byte(
//---------------Read Two Bytes
static VOID
efuse_ShadowRead2Byte(
IN PADAPTER pAdapter,
IN struct adapter *pAdapter,
IN u16 Offset,
IN OUT u16 *Value)
{
@ -985,7 +985,7 @@ efuse_ShadowRead2Byte(
//---------------Read Four Bytes
static VOID
efuse_ShadowRead4Byte(
IN PADAPTER pAdapter,
IN struct adapter *pAdapter,
IN u16 Offset,
IN OUT u32 *Value)
{
@ -1020,13 +1020,13 @@ efuse_ShadowRead4Byte(
#ifdef PLATFORM
static VOID
efuse_ShadowWrite1Byte(
IN PADAPTER pAdapter,
IN struct adapter *pAdapter,
IN u16 Offset,
IN u8 Value);
#endif //PLATFORM
static VOID
efuse_ShadowWrite1Byte(
IN PADAPTER pAdapter,
IN struct adapter *pAdapter,
IN u16 Offset,
IN u8 Value)
{
@ -1039,7 +1039,7 @@ efuse_ShadowWrite1Byte(
//---------------Write Two Bytes
static VOID
efuse_ShadowWrite2Byte(
IN PADAPTER pAdapter,
IN struct adapter *pAdapter,
IN u16 Offset,
IN u16 Value)
{
@ -1053,7 +1053,7 @@ efuse_ShadowWrite2Byte(
//---------------Write Four Bytes
static VOID
efuse_ShadowWrite4Byte(
IN PADAPTER pAdapter,
IN struct adapter *pAdapter,
IN u16 Offset,
IN u32 Value)
{
@ -1083,7 +1083,7 @@ efuse_ShadowWrite4Byte(
*
*---------------------------------------------------------------------------*/
void EFUSE_ShadowMapUpdate(
IN PADAPTER pAdapter,
IN struct adapter *pAdapter,
IN u8 efuseType,
IN BOOLEAN bPseudoTest)
{
@ -1133,7 +1133,7 @@ void EFUSE_ShadowMapUpdate(
*---------------------------------------------------------------------------*/
void
EFUSE_ShadowRead(
IN PADAPTER pAdapter,
IN struct adapter *pAdapter,
IN u8 Type,
IN u16 Offset,
IN OUT u32 *Value )
@ -1165,13 +1165,13 @@ EFUSE_ShadowRead(
*---------------------------------------------------------------------------*/
VOID
EFUSE_ShadowWrite(
IN PADAPTER pAdapter,
IN struct adapter *pAdapter,
IN u8 Type,
IN u16 Offset,
IN OUT u32 Value);
VOID
EFUSE_ShadowWrite(
IN PADAPTER pAdapter,
IN struct adapter *pAdapter,
IN u8 Type,
IN u16 Offset,
IN OUT u32 Value)
@ -1194,11 +1194,11 @@ EFUSE_ShadowWrite(
VOID
Efuse_InitSomeVar(
IN PADAPTER pAdapter
IN struct adapter *pAdapter
);
VOID
Efuse_InitSomeVar(
IN PADAPTER pAdapter
IN struct adapter *pAdapter
)
{
u8 i;

50
core/rtw_io.c
View file

@ -83,7 +83,7 @@ jackson@realtek.com.tw
#endif
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;
@ -98,7 +98,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_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
@ -113,7 +113,7 @@ u16 _rtw_read16(_adapter *adapter, u32 addr)
return rtw_le16_to_cpu(r_val);
}
u32 _rtw_read32(_adapter *adapter, u32 addr)
u32 _rtw_read32(struct adapter *adapter, u32 addr)
{
u32 r_val;
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
@ -129,7 +129,7 @@ u32 _rtw_read32(_adapter *adapter, u32 addr)
}
int _rtw_write8(_adapter *adapter, u32 addr, u8 val)
int _rtw_write8(struct adapter *adapter, u32 addr, u8 val)
{
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv;
@ -144,7 +144,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_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv;
@ -160,7 +160,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_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv;
@ -177,7 +177,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_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv;
@ -192,7 +192,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_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv;
@ -207,7 +207,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_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv;
@ -222,7 +222,7 @@ int _rtw_write16_async(_adapter *adapter, u32 addr, u16 val)
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_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv;
@ -238,7 +238,7 @@ int _rtw_write32_async(_adapter *adapter, u32 addr, u32 val)
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_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
@ -261,7 +261,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_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
@ -278,7 +278,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_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
@ -301,7 +301,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;
@ -314,7 +314,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_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
@ -333,7 +333,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;
@ -350,7 +350,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;
@ -363,7 +363,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;
@ -442,7 +442,7 @@ bool match_write_sniff_ranges(u16 addr, u16 len)
return _FALSE;
}
u8 dbg_rtw_read8(_adapter *adapter, u32 addr, const char *caller, const int line)
u8 dbg_rtw_read8(struct adapter *adapter, u32 addr, const char *caller, const int line)
{
u8 val = _rtw_read8(adapter, addr);
@ -452,7 +452,7 @@ u8 dbg_rtw_read8(_adapter *adapter, u32 addr, const char *caller, const int line
return val;
}
u16 dbg_rtw_read16(_adapter *adapter, u32 addr, const char *caller, const int line)
u16 dbg_rtw_read16(struct adapter *adapter, u32 addr, const char *caller, const int line)
{
u16 val = _rtw_read16(adapter, addr);
@ -462,7 +462,7 @@ u16 dbg_rtw_read16(_adapter *adapter, u32 addr, const char *caller, const int li
return val;
}
u32 dbg_rtw_read32(_adapter *adapter, u32 addr, const char *caller, const int line)
u32 dbg_rtw_read32(struct adapter *adapter, u32 addr, const char *caller, const int line)
{
u32 val = _rtw_read32(adapter, addr);
@ -472,28 +472,28 @@ u32 dbg_rtw_read32(_adapter *adapter, u32 addr, const char *caller, const int li
return val;
}
int dbg_rtw_write8(_adapter *adapter, u32 addr, u8 val, const char *caller, const int line)
int dbg_rtw_write8(struct adapter *adapter, u32 addr, u8 val, const char *caller, const int line)
{
if (match_write_sniff_ranges(addr, 1))
DBG_871X("DBG_IO %s:%d rtw_write8(0x%04x, 0x%02x)\n", caller, line, addr, val);
return _rtw_write8(adapter, addr, val);
}
int dbg_rtw_write16(_adapter *adapter, u32 addr, u16 val, const char *caller, const int line)
int dbg_rtw_write16(struct adapter *adapter, u32 addr, u16 val, const char *caller, const int line)
{
if (match_write_sniff_ranges(addr, 2))
DBG_871X("DBG_IO %s:%d rtw_write16(0x%04x, 0x%04x)\n", caller, line, addr, val);
return _rtw_write16(adapter, addr, val);
}
int dbg_rtw_write32(_adapter *adapter, u32 addr, u32 val, const char *caller, const int line)
int dbg_rtw_write32(struct adapter *adapter, u32 addr, u32 val, const char *caller, const int line)
{
if (match_write_sniff_ranges(addr, 4))
DBG_871X("DBG_IO %s:%d rtw_write32(0x%04x, 0x%08x)\n", caller, line, addr, val);
return _rtw_write32(adapter, addr, val);
}
int dbg_rtw_writeN(_adapter *adapter, u32 addr ,u32 length , u8 *data, const char *caller, const int line)
int dbg_rtw_writeN(struct adapter *adapter, u32 addr ,u32 length , u8 *data, const char *caller, const int line)
{
if (match_write_sniff_ranges(addr, length))
DBG_871X("DBG_IO %s:%d rtw_writeN(0x%04x, %u)\n", caller, line, addr, length);

44
core/rtw_ioctl_set.c
View file

@ -38,7 +38,7 @@
#include <gspi_osintf.h>
#endif
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) \
( \
@ -93,8 +93,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)
{
_irqL irqL;
_list *plist, *phead;
@ -237,7 +237,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)
{
_irqL irqL;
u8 status=_SUCCESS;
@ -321,7 +321,7 @@ _func_exit_;
return status;
}
u8 rtw_set_802_11_ssid(_adapter* padapter, NDIS_802_11_SSID *ssid)
u8 rtw_set_802_11_ssid(struct adapter* padapter, NDIS_802_11_SSID *ssid)
{
_irqL irqL;
u8 status = _SUCCESS;
@ -445,7 +445,7 @@ _func_exit_;
}
u8 rtw_set_802_11_connect(_adapter* padapter, u8 *bssid, NDIS_802_11_SSID *ssid)
u8 rtw_set_802_11_connect(struct adapter* padapter, u8 *bssid, NDIS_802_11_SSID *ssid)
{
_irqL irqL;
u8 status = _SUCCESS;
@ -518,7 +518,7 @@ _func_exit_;
return status;
}
u8 rtw_set_802_11_infrastructure_mode(_adapter* padapter,
u8 rtw_set_802_11_infrastructure_mode(struct adapter* padapter,
NDIS_802_11_NETWORK_INFRASTRUCTURE networktype)
{
_irqL irqL;
@ -606,7 +606,7 @@ _func_exit_;
}
u8 rtw_set_802_11_disassociate(_adapter *padapter)
u8 rtw_set_802_11_disassociate(struct adapter *padapter)
{
_irqL irqL;
struct mlme_priv * pmlmepriv = &padapter->mlmepriv;
@ -633,7 +633,7 @@ _func_exit_;
return _TRUE;
}
u8 rtw_set_802_11_bssid_list_scan(_adapter* padapter, NDIS_802_11_SSID *pssid, int ssid_max_num)
u8 rtw_set_802_11_bssid_list_scan(struct adapter* padapter, NDIS_802_11_SSID *pssid, int ssid_max_num)
{
_irqL irqL;
struct mlme_priv *pmlmepriv= &padapter->mlmepriv;
@ -685,7 +685,7 @@ _func_exit_;
return res;
}
u8 rtw_set_802_11_authentication_mode(_adapter* padapter, NDIS_802_11_AUTHENTICATION_MODE authmode)
u8 rtw_set_802_11_authentication_mode(struct adapter* padapter, NDIS_802_11_AUTHENTICATION_MODE authmode)
{
struct security_priv *psecuritypriv = &padapter->securitypriv;
int res;
@ -719,7 +719,7 @@ _func_exit_;
return ret;
}
u8 rtw_set_802_11_add_wep(_adapter* padapter, NDIS_802_11_WEP *wep){
u8 rtw_set_802_11_add_wep(struct adapter* padapter, NDIS_802_11_WEP *wep){
u8 bdefaultkey;
u8 btransmitkey;
@ -783,7 +783,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;
@ -826,7 +826,7 @@ _func_exit_;
}
u8 rtw_set_802_11_add_key(_adapter* padapter, NDIS_802_11_KEY *key){
u8 rtw_set_802_11_add_key(struct adapter* padapter, NDIS_802_11_KEY *key){
uint encryptionalgo;
u8 * pbssid;
@ -1191,7 +1191,7 @@ _func_exit_;
return ret;
}
u8 rtw_set_802_11_remove_key(_adapter* padapter, NDIS_802_11_REMOVE_KEY *key){
u8 rtw_set_802_11_remove_key(struct adapter* padapter, NDIS_802_11_REMOVE_KEY *key){
uint encryptionalgo;
u8 * pbssid;
@ -1246,11 +1246,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;
@ -1318,12 +1318,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, RT_SCAN_TYPE scan_mode)
int rtw_set_scan_mode(struct adapter *adapter, RT_SCAN_TYPE scan_mode)
{
if(scan_mode != SCAN_ACTIVE && scan_mode != SCAN_PASSIVE)
return _FAIL;
@ -1335,12 +1335,12 @@ int rtw_set_scan_mode(_adapter *adapter, 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;
@ -1351,12 +1351,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;

14
core/rtw_iol.c
View file

@ -21,7 +21,7 @@
#include<rtw_iol.h>
#ifdef CONFIG_IOL
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;
@ -96,7 +96,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;
@ -109,7 +109,7 @@ bool rtw_IOL_applied(ADAPTER *adapter)
return _FALSE;
}
/*
bool rtw_IOL_applied(ADAPTER *adapter)
bool rtw_IOL_applied(struct adapter *adapter)
{
if(adapter->registrypriv.fw_iol)
return _TRUE;
@ -123,7 +123,7 @@ bool rtw_IOL_applied(ADAPTER *adapter)
}
*/
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);
}
@ -262,7 +262,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;
@ -376,7 +376,7 @@ int rtw_IOL_append_END_cmd(struct xmit_frame *xmit_frame)
}
int rtw_IOL_exec_cmd_array_sync(PADAPTER adapter, u8 *IOL_cmds, u32 cmd_num, u32 max_wating_ms)
int rtw_IOL_exec_cmd_array_sync(Pstruct adapter adapter, u8 *IOL_cmds, u32 cmd_num, u32 max_wating_ms)
{
struct xmit_frame *xmit_frame;
@ -389,7 +389,7 @@ int rtw_IOL_exec_cmd_array_sync(PADAPTER adapter, u8 *IOL_cmds, u32 cmd_num, u32
return rtw_IOL_exec_cmds_sync(adapter, xmit_frame, max_wating_ms,0);
}
int rtw_IOL_exec_empty_cmds_sync(ADAPTER *adapter, u32 max_wating_ms)
int rtw_IOL_exec_empty_cmds_sync(struct adapter *adapter, u32 max_wating_ms)
{
IOL_CMD end_cmd = {0x0, IOL_CMD_END, 0x0, 0x0};
return rtw_IOL_exec_cmd_array_sync(adapter, (u8*)&end_cmd, 1, max_wating_ms);

40
core/rtw_led.c
View file

@ -28,7 +28,7 @@
void BlinkTimerCallback(void *data)
{
PLED_871x pLed = (PLED_871x)data;
_adapter *padapter = pLed->padapter;
struct adapter *padapter = pLed->padapter;
//DBG_871X("%s\n", __FUNCTION__);
@ -92,7 +92,7 @@ void ResetLedStatus(PLED_871x pLed) {
//
void
InitLed871x(
_adapter *padapter,
struct adapter *padapter,
PLED_871x pLed,
LED_PIN_871x LedPin
)
@ -134,8 +134,8 @@ DeInitLed871x(
//
#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
void SwLedOn(_adapter *padapter, PLED_871x pLed);
void SwLedOff(_adapter *padapter, PLED_871x pLed);
void SwLedOn(struct adapter *padapter, PLED_871x pLed);
void SwLedOff(struct adapter *padapter, PLED_871x pLed);
#define CONFIG_LED_REMOVE_HAL
@ -144,7 +144,7 @@ SwLedBlink(
PLED_871x pLed
)
{
_adapter *padapter = pLed->padapter;
struct adapter *padapter = pLed->padapter;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
u8 bStopBlinking = _FALSE;
@ -262,7 +262,7 @@ SwLedBlink1(
PLED_871x pLed
)
{
_adapter *padapter = pLed->padapter;
struct adapter *padapter = pLed->padapter;
#ifndef CONFIG_LED_REMOVE_HAL
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
#endif
@ -474,7 +474,7 @@ SwLedBlink2(
PLED_871x pLed
)
{
_adapter *padapter = pLed->padapter;
struct adapter *padapter = pLed->padapter;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
u8 bStopBlinking = _FALSE;
@ -596,7 +596,7 @@ SwLedBlink3(
PLED_871x pLed
)
{
_adapter *padapter = pLed->padapter;
struct adapter *padapter = pLed->padapter;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
u8 bStopBlinking = _FALSE;
@ -767,7 +767,7 @@ SwLedBlink4(
PLED_871x pLed
)
{
_adapter *padapter = pLed->padapter;
struct adapter *padapter = pLed->padapter;
struct led_priv *ledpriv = &(padapter->ledpriv);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
PLED_871x pLed1 = &(ledpriv->SwLed1);
@ -966,7 +966,7 @@ SwLedBlink5(
PLED_871x pLed
)
{
_adapter *padapter = pLed->padapter;
struct adapter *padapter = pLed->padapter;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
u8 bStopBlinking = _FALSE;
@ -1084,7 +1084,7 @@ SwLedBlink6(
PLED_871x pLed
)
{
_adapter *padapter = pLed->padapter;
struct adapter *padapter = pLed->padapter;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
u8 bStopBlinking = _FALSE;
@ -1105,7 +1105,7 @@ SwLedBlink6(
static void
SwLedControlMode0(
_adapter *padapter,
struct adapter *padapter,
LED_CTL_MODE LedAction
)
{
@ -1220,7 +1220,7 @@ SwLedControlMode0(
//ALPHA, added by chiyoko, 20090106
static void
SwLedControlMode1(
_adapter *padapter,
struct adapter *padapter,
LED_CTL_MODE LedAction
)
{
@ -1495,7 +1495,7 @@ SwLedControlMode1(
//Arcadyan/Sitecom , added by chiyoko, 20090216
static void
SwLedControlMode2(
_adapter *padapter,
struct adapter *padapter,
LED_CTL_MODE LedAction
)
{
@ -1660,7 +1660,7 @@ SwLedControlMode2(
//COREGA, added by chiyoko, 20090316
static void
SwLedControlMode3(
_adapter *padapter,
struct adapter *padapter,
LED_CTL_MODE LedAction
)
{
@ -1839,7 +1839,7 @@ SwLedControlMode2(
//Edimax-Belkin, added by chiyoko, 20090413
static void
SwLedControlMode4(
_adapter *padapter,
struct adapter *padapter,
LED_CTL_MODE LedAction
)
{
@ -2171,7 +2171,7 @@ SwLedControlMode4(
//Sercomm-Belkin, added by chiyoko, 20090415
static void
SwLedControlMode5(
_adapter *padapter,
struct adapter *padapter,
LED_CTL_MODE LedAction
)
{
@ -2262,7 +2262,7 @@ SwLedControlMode5(
//WNC-Corega, added by chiyoko, 20090902
static void
SwLedControlMode6(
_adapter *padapter,
struct adapter *padapter,
LED_CTL_MODE LedAction
)
{
@ -2299,7 +2299,7 @@ SwLedControlMode6(
//
void BlinkHandler(PLED_871x pLed)
{
_adapter *padapter = pLed->padapter;
struct adapter *padapter = pLed->padapter;
struct led_priv *ledpriv = &(padapter->ledpriv);
//DBG_871X("%s (%s:%d)\n",__FUNCTION__, current->comm, current->pid);
@ -2349,7 +2349,7 @@ void BlinkHandler(PLED_871x pLed)
void
LedControl871x(
_adapter *padapter,
struct adapter *padapter,
LED_CTL_MODE LedAction
)
{

144
core/rtw_mlme.c
View file

@ -32,8 +32,8 @@
#include <wlan_bssdef.h>
#include <rtw_ioctl_set.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);
#ifdef CONFIG_DISABLE_MCS13TO15
extern unsigned char MCS_rate_2R_MCS13TO15_OFF[16];
@ -43,7 +43,7 @@ extern unsigned char MCS_rate_2R[16];
#endif //CONFIG_DISABLE_MCS13TO15
extern unsigned char MCS_rate_1R[16];
sint _rtw_init_mlme_priv (_adapter* padapter)
sint _rtw_init_mlme_priv (struct adapter* padapter)
{
sint i;
u8 *pbuf;
@ -382,7 +382,7 @@ _func_exit_;
}
void _rtw_free_network_queue(_adapter *padapter, u8 isfreeall)
void _rtw_free_network_queue(struct adapter *padapter, u8 isfreeall)
{
_irqL irqL;
_list *phead, *plist;
@ -418,7 +418,7 @@ _func_exit_;
sint rtw_if_up(_adapter *padapter) {
sint rtw_if_up(struct adapter *padapter) {
sint res;
_func_enter_;
@ -479,7 +479,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_;
@ -545,7 +545,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);
@ -564,7 +564,7 @@ struct wlan_network *rtw_find_network(_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;
@ -680,7 +680,7 @@ _func_exit_;
}
void update_network(WLAN_BSSID_EX *dst, 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;
@ -792,7 +792,7 @@ _func_enter_;
_func_exit_;
}
static void update_current_network(_adapter *adapter, WLAN_BSSID_EX *pnetwork)
static void update_current_network(struct adapter *adapter, WLAN_BSSID_EX *pnetwork)
{
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
@ -828,7 +828,7 @@ Caller must hold pmlmepriv->lock first.
*/
void rtw_update_scanned_network(_adapter *adapter, WLAN_BSSID_EX *target)
void rtw_update_scanned_network(struct adapter *adapter, WLAN_BSSID_EX *target)
{
_irqL irqL;
_list *plist, *phead;
@ -966,11 +966,11 @@ exit:
_func_exit_;
}
void rtw_add_network(_adapter *adapter, WLAN_BSSID_EX *pnetwork);
void rtw_add_network(_adapter *adapter, WLAN_BSSID_EX *pnetwork)
void rtw_add_network(struct adapter *adapter, WLAN_BSSID_EX *pnetwork);
void rtw_add_network(struct adapter *adapter, WLAN_BSSID_EX *pnetwork)
{
_irqL irqL;
struct mlme_priv *pmlmepriv = &(((_adapter *)adapter)->mlmepriv);
struct mlme_priv *pmlmepriv = &(((struct adapter *)adapter)->mlmepriv);
//_queue *queue = &(pmlmepriv->scanned_queue);
_func_enter_;
@ -996,8 +996,8 @@ _func_exit_;
// (3) WMM
// (4) HT
// (5) others
int rtw_is_desired_network(_adapter *adapter, struct wlan_network *pnetwork);
int rtw_is_desired_network(_adapter *adapter, struct wlan_network *pnetwork)
int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwork);
int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwork)
{
struct security_priv *psecuritypriv = &adapter->securitypriv;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@ -1058,7 +1058,7 @@ int rtw_is_desired_network(_adapter *adapter, struct wlan_network *pnetwork)
}
/* 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_;
@ -1068,7 +1068,7 @@ _func_exit_;
}
void rtw_survey_event_callback(_adapter *adapter, u8 *pbuf)
void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)
{
_irqL irqL;
u32 len;
@ -1134,7 +1134,7 @@ _func_exit_;
void rtw_surveydone_event_callback(_adapter *adapter, u8 *pbuf)
void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
{
_irqL irqL;
u8 timer_cancelled = _FALSE;
@ -1310,12 +1310,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)
{
}
@ -1354,7 +1354,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)
{
_irqL irqL;
struct wlan_network* pwlan = NULL;
@ -1468,7 +1468,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;
@ -1526,7 +1526,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);
@ -1587,12 +1587,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;
@ -1624,7 +1624,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;
@ -1734,7 +1734,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);
@ -1812,7 +1812,7 @@ static void rtw_joinbss_update_network(_adapter *padapter, struct wlan_network *
//if join_res > 0, update "cur_network->network" from "pnetwork->network" if (ptarget_wlan !=NULL).
//
//#define REJOIN
void rtw_joinbss_event_prehandle(_adapter *adapter, u8 *pbuf)
void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
{
_irqL irqL,irqL2;
static u8 retry=0;
@ -2004,7 +2004,7 @@ ignore_joinbss_callback:
_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;
@ -2025,7 +2025,7 @@ _func_enter_;
_func_exit_;
}
u8 search_max_mac_id(_adapter *padapter)
u8 search_max_mac_id(struct adapter *padapter)
{
u8 mac_id, aid;
#if (RATE_ADAPTIVE_SUPPORT==1) //for 88E RA
@ -2068,7 +2068,7 @@ u8 search_max_mac_id(_adapter *padapter)
}
//FOR STA, AP ,AD-HOC mode
void rtw_sta_media_status_rpt(_adapter *adapter,struct sta_info *psta, u32 mstatus)
void rtw_sta_media_status_rpt(struct adapter *adapter,struct sta_info *psta, u32 mstatus)
{
u16 media_status_rpt;
@ -2084,7 +2084,7 @@ void rtw_sta_media_status_rpt(_adapter *adapter,struct sta_info *psta, u32 mstat
rtw_hal_set_hwreg(adapter,HW_VAR_H2C_MEDIA_STATUS_RPT,(u8 *)&media_status_rpt);
}
void rtw_stassoc_event_callback(_adapter *adapter, u8 *pbuf)
void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)
{
_irqL irqL;
struct sta_info *psta;
@ -2207,7 +2207,7 @@ _func_exit_;
}
void rtw_stadel_event_callback(_adapter *adapter, u8 *pbuf)
void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
{
_irqL irqL,irqL2;
int mac_id=-1;
@ -2353,7 +2353,7 @@ _func_exit_;
}
void rtw_cpwm_event_callback(PADAPTER padapter, u8 *pbuf)
void rtw_cpwm_event_callback(struct adapter *padapter, u8 *pbuf)
{
#ifdef CONFIG_LPS_LCLK
struct reportpwrstate_parm *preportpwrstate;
@ -2374,9 +2374,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)
{
_irqL irqL;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@ -2452,9 +2452,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)
{
_irqL irqL;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@ -2471,7 +2471,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 = adapter_to_pwrctl(padapter);
@ -2520,14 +2520,14 @@ 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;
#endif //CONFIG_AP_MODE
struct registry_priv *pregistrypriv = &adapter->registrypriv;
#ifdef CONFIG_CONCURRENT_MODE
PADAPTER pbuddy_adapter = adapter->pbuddy_adapter;
struct adapter *pbuddy_adapter = adapter->pbuddy_adapter;
#endif
if(!adapter)
@ -2600,7 +2600,7 @@ void rtw_dynamic_check_timer_handlder(_adapter *adapter)
&& (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) )
{
// expire NAT2.5 entry
void nat25_db_expire(_adapter *priv);
void nat25_db_expire(struct adapter *priv);
nat25_db_expire(adapter);
if (adapter->pppoe_connection_in_progress > 0) {
@ -2623,13 +2623,13 @@ void rtw_dynamic_check_timer_handlder(_adapter *adapter)
#ifdef CONFIG_SET_SCAN_DENY_TIMER
inline bool rtw_is_scan_deny(_adapter *adapter)
inline bool rtw_is_scan_deny(struct adapter *adapter)
{
struct mlme_priv *mlmepriv = &adapter->mlmepriv;
return (ATOMIC_READ(&mlmepriv->set_scan_deny) != 0) ? _TRUE : _FALSE;
}
inline void rtw_clear_scan_deny(_adapter *adapter)
inline void rtw_clear_scan_deny(struct adapter *adapter)
{
struct mlme_priv *mlmepriv = &adapter->mlmepriv;
ATOMIC_SET(&mlmepriv->set_scan_deny, 0);
@ -2637,12 +2637,12 @@ inline void rtw_clear_scan_deny(_adapter *adapter)
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter));
}
void rtw_set_scan_deny_timer_hdl(_adapter *adapter)
void rtw_set_scan_deny_timer_hdl(struct adapter *adapter)
{
rtw_clear_scan_deny(adapter);
}
void rtw_set_scan_deny(_adapter *adapter, u32 ms)
void rtw_set_scan_deny(struct adapter *adapter, u32 ms)
{
struct mlme_priv *mlmepriv = &adapter->mlmepriv;
#ifdef CONFIG_CONCURRENT_MODE
@ -2669,7 +2669,7 @@ void rtw_set_scan_deny(_adapter *adapter, u32 ms)
#endif
#ifdef CONFIG_DETECT_C2H_BY_POLLING
void rtw_event_polling_timer_hdl(_adapter *adapter)
void rtw_event_polling_timer_hdl(struct adapter *adapter)
{
rtw_event_polling_cmd(adapter);
}
@ -2690,7 +2690,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
@ -2762,7 +2762,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv )
_irqL irqL;
int ret;
_list *phead;
_adapter *adapter;
struct adapter *adapter;
_queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL;
struct wlan_network *candidate = NULL;
@ -2772,7 +2772,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 );
@ -2856,7 +2856,7 @@ _func_exit_;
return ret;
}
sint rtw_set_auth(_adapter * adapter,struct security_priv *psecuritypriv)
sint rtw_set_auth(struct adapter * adapter,struct security_priv *psecuritypriv)
{
struct cmd_obj* pcmd;
struct setauth_parm *psetauthparm;
@ -2903,7 +2903,7 @@ _func_exit_;
}
sint rtw_set_key(_adapter * adapter,struct security_priv *psecuritypriv,sint keyid, u8 set_tx, bool enqueue)
sint rtw_set_key(struct adapter * adapter,struct security_priv *psecuritypriv,sint keyid, u8 set_tx, bool enqueue)
{
u8 keylen;
struct cmd_obj *pcmd;
@ -2998,7 +2998,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;
@ -3052,7 +3052,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;
@ -3093,7 +3093,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;
@ -3112,7 +3112,7 @@ static int rtw_append_pmkid(_adapter *Adapter,int iEntry, u8 *ie, uint ie_len)
return (ie_len);
}
sint rtw_restruct_sec_ie(_adapter *adapter,u8 *in_ie, u8 *out_ie, uint in_len)
sint 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];
@ -3183,7 +3183,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;
@ -3208,7 +3208,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;
@ -3285,7 +3285,7 @@ _func_exit_;
}
void rtw_get_encrypt_decrypt_from_registrypriv(_adapter* adapter)
void rtw_get_encrypt_decrypt_from_registrypriv(struct adapter* adapter)
{
_func_enter_;
@ -3295,7 +3295,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;
@ -3343,7 +3343,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;
@ -3413,7 +3413,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;
@ -3599,7 +3599,7 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len)
}
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;
@ -3655,19 +3655,19 @@ void rtw_issue_addbareq_cmd(_adapter *padapter, struct xmit_frame *pxmitframe)
#endif
#ifdef CONFIG_LAYER2_ROAMING
inline void rtw_set_roaming(_adapter *adapter, u8 to_roaming)
inline void rtw_set_roaming(struct adapter *adapter, u8 to_roaming)
{
if (to_roaming == 0)
adapter->mlmepriv.to_join = _FALSE;
adapter->mlmepriv.to_roaming = to_roaming;
}
inline u8 rtw_to_roaming(_adapter *adapter)
inline u8 rtw_to_roaming(struct adapter *adapter)
{
return adapter->mlmepriv.to_roaming;
}
void rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network)
void rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network)
{
_irqL irqL;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -3676,7 +3676,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;
@ -3721,7 +3721,7 @@ void _rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network)
}
#endif
sint rtw_linked_check(_adapter *padapter)
sint rtw_linked_check(struct adapter *padapter)
{
if( (check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) == _TRUE) ||
(check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE) == _TRUE))
@ -3738,7 +3738,7 @@ sint rtw_linked_check(_adapter *padapter)
}
#ifdef CONFIG_CONCURRENT_MODE
sint rtw_buddy_adapter_up(_adapter *padapter)
sint rtw_buddy_adapter_up(struct adapter *padapter)
{
sint res = _FALSE;
@ -3764,7 +3764,7 @@ sint rtw_buddy_adapter_up(_adapter *padapter)
}
sint check_buddy_fwstate(_adapter *padapter, sint state)
sint check_buddy_fwstate(struct adapter *padapter, sint state)
{
if(padapter == NULL)
return _FALSE;
@ -3782,7 +3782,7 @@ sint check_buddy_fwstate(_adapter *padapter, sint state)
return _FALSE;
}
u8 rtw_get_buddy_bBusyTraffic(_adapter *padapter)
u8 rtw_get_buddy_bBusyTraffic(struct adapter *padapter)
{
if(padapter == NULL)
return _FALSE;

310
core/rtw_mlme_ext.c
View file

File diff suppressed because it is too large Load diff

18
core/rtw_odm.c
View file

@ -101,7 +101,7 @@ const char *odm_dbg_level_str[] = {
#define RTW_ODM_DBG_LEVEL_NUM 6
int _rtw_odm_dbg_comp_msg(_adapter *adapter, char *buf, int len)
int _rtw_odm_dbg_comp_msg(struct adapter *adapter, char *buf, int len)
{
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter);
DM_ODM_T *odm = &pHalData->odmpriv;
@ -120,7 +120,7 @@ int _rtw_odm_dbg_comp_msg(_adapter *adapter, char *buf, int len)
return cnt;
}
void rtw_odm_dbg_comp_msg(_adapter *adapter)
void rtw_odm_dbg_comp_msg(struct adapter *adapter)
{
char buf[768] = {0};
@ -128,12 +128,12 @@ void rtw_odm_dbg_comp_msg(_adapter *adapter)
DBG_871X_LEVEL(_drv_always_, "\n%s", buf);
}
inline void rtw_odm_dbg_comp_set(_adapter *adapter, u64 comps)
inline void rtw_odm_dbg_comp_set(struct adapter *adapter, u64 comps)
{
rtw_hal_set_def_var(adapter, HW_DEF_ODM_DBG_FLAG, &comps);
}
int _rtw_odm_dbg_level_msg(_adapter *adapter, char *buf, int len)
int _rtw_odm_dbg_level_msg(struct adapter *adapter, char *buf, int len)
{
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter);
DM_ODM_T *odm = &pHalData->odmpriv;
@ -151,7 +151,7 @@ int _rtw_odm_dbg_level_msg(_adapter *adapter, char *buf, int len)
return cnt;
}
void rtw_odm_dbg_level_msg(_adapter *adapter)
void rtw_odm_dbg_level_msg(struct adapter *adapter)
{
char buf[100] = {0};
@ -159,12 +159,12 @@ void rtw_odm_dbg_level_msg(_adapter *adapter)
DBG_871X_LEVEL(_drv_always_, "\n%s", buf);
}
inline void rtw_odm_dbg_level_set(_adapter *adapter, u32 level)
inline void rtw_odm_dbg_level_set(struct adapter *adapter, u32 level)
{
rtw_hal_set_def_var(adapter, HW_DEF_ODM_DBG_LEVEL, &level);
}
int _rtw_odm_adaptivity_parm_msg(_adapter *adapter, char *buf, int len)
int _rtw_odm_adaptivity_parm_msg(struct adapter *adapter, char *buf, int len)
{
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter);
DM_ODM_T *odm = &pHalData->odmpriv;
@ -182,7 +182,7 @@ int _rtw_odm_adaptivity_parm_msg(_adapter *adapter, char *buf, int len)
);
}
void rtw_odm_adaptivity_parm_msg(_adapter *adapter)
void rtw_odm_adaptivity_parm_msg(struct adapter *adapter)
{
char buf[256] = {0};
@ -190,7 +190,7 @@ void rtw_odm_adaptivity_parm_msg(_adapter *adapter)
DBG_871X_LEVEL(_drv_always_, "\n%s", buf);
}
void rtw_odm_adaptivity_parm_set(_adapter *adapter, s8 TH_L2H_ini, s8 TH_EDCCA_HL_diff,
void rtw_odm_adaptivity_parm_set(struct adapter *adapter, s8 TH_L2H_ini, s8 TH_EDCCA_HL_diff,
s8 IGI_Base, bool ForceEDCCA, u8 AdapEn_RSSI, u8 IGI_LowerBound)
{
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter);

128
core/rtw_p2p.c
View file

@ -40,7 +40,7 @@ int rtw_p2p_is_channel_list_ok( u8 desired_ch, u8* ch_list, u8 ch_cnt )
return( found );
}
int is_any_client_associated(_adapter *padapter)
int is_any_client_associated(struct adapter *padapter)
{
return padapter->stapriv.asoc_list_cnt ? _TRUE : _FALSE;
}
@ -53,7 +53,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_871X("%s\n", __FUNCTION__);
@ -153,7 +153,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
@ -212,7 +212,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;
@ -281,7 +281,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.
@ -396,7 +396,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
@ -535,7 +535,7 @@ u32 build_beacon_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
{
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0;
_adapter *padapter = pwdinfo->padapter;
struct adapter *padapter = pwdinfo->padapter;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info;
@ -652,7 +652,7 @@ u32 build_probe_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
{
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0;
_adapter *padapter = pwdinfo->padapter;
struct adapter *padapter = pwdinfo->padapter;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info;
@ -765,7 +765,7 @@ u32 build_probe_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8 tunnel
{
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0;
_adapter *padapter = pwdinfo->padapter;
struct adapter *padapter = pwdinfo->padapter;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info;
@ -960,7 +960,7 @@ u32 build_assoc_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
{
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0;
_adapter *padapter = NULL;
struct adapter *padapter = NULL;
struct mlme_priv *pmlmepriv = NULL;
struct wifi_display_info *pwfd_info = NULL;
@ -1067,7 +1067,7 @@ u32 build_assoc_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
{
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0;
_adapter *padapter = pwdinfo->padapter;
struct adapter *padapter = pwdinfo->padapter;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info;
@ -1165,7 +1165,7 @@ u32 build_nego_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
{
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0;
_adapter *padapter = pwdinfo->padapter;
struct adapter *padapter = pwdinfo->padapter;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info;
@ -1263,7 +1263,7 @@ u32 build_nego_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
{
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0;
_adapter *padapter = pwdinfo->padapter;
struct adapter *padapter = pwdinfo->padapter;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info;
@ -1362,7 +1362,7 @@ u32 build_nego_confirm_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
{
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0;
_adapter *padapter = pwdinfo->padapter;
struct adapter *padapter = pwdinfo->padapter;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info;
@ -1461,7 +1461,7 @@ u32 build_invitation_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
{
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0;
_adapter *padapter = pwdinfo->padapter;
struct adapter *padapter = pwdinfo->padapter;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info;
@ -1574,7 +1574,7 @@ u32 build_invitation_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
{
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0;
_adapter *padapter = pwdinfo->padapter;
struct adapter *padapter = pwdinfo->padapter;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info;
@ -1687,7 +1687,7 @@ u32 build_provdisc_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
{
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0;
_adapter *padapter = pwdinfo->padapter;
struct adapter *padapter = pwdinfo->padapter;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info;
@ -1786,7 +1786,7 @@ u32 build_provdisc_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
{
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0;
_adapter *padapter = pwdinfo->padapter;
struct adapter *padapter = pwdinfo->padapter;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info;
@ -2503,7 +2503,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;
@ -2707,7 +2707,7 @@ u8 rtw_p2p_ch_inclusion(struct mlme_ext_priv *pmlmeext, u8 *peer_ch_list, u8 pee
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;
@ -2724,7 +2724,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
#endif // CONFIG_TDLS
#endif // CONFIG_WFD
#ifdef CONFIG_CONCURRENT_MODE
_adapter *pbuddy_adapter = pwdinfo->padapter->pbuddy_adapter;
struct adapter *pbuddy_adapter = pwdinfo->padapter->pbuddy_adapter;
struct wifidirect_info *pbuddy_wdinfo = &pbuddy_adapter->wdinfo;
struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv;
struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
@ -2943,7 +2943,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;
@ -3317,7 +3317,7 @@ u8 process_p2p_presence_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le
return _TRUE;
}
void find_phase_handler( _adapter* padapter )
void find_phase_handler( struct adapter* padapter )
{
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -3341,9 +3341,9 @@ _func_enter_;
_func_exit_;
}
void p2p_concurrent_handler( _adapter* padapter );
void p2p_concurrent_handler( struct adapter* padapter );
void restore_p2p_state_handler( _adapter* padapter )
void restore_p2p_state_handler( struct adapter* padapter )
{
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -3358,7 +3358,7 @@ _func_enter_;
#ifdef CONFIG_CONCURRENT_MODE
if ( check_buddy_fwstate(padapter, _FW_LINKED ) )
{
_adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv;
struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
@ -3386,7 +3386,7 @@ _func_enter_;
_func_exit_;
}
void pre_tx_invitereq_handler( _adapter* padapter )
void pre_tx_invitereq_handler( struct adapter* padapter )
{
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
u8 val8 = 1;
@ -3400,7 +3400,7 @@ _func_enter_;
_func_exit_;
}
void pre_tx_provdisc_handler( _adapter* padapter )
void pre_tx_provdisc_handler( struct adapter* padapter )
{
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
u8 val8 = 1;
@ -3414,7 +3414,7 @@ _func_enter_;
_func_exit_;
}
void pre_tx_negoreq_handler( _adapter* padapter )
void pre_tx_negoreq_handler( struct adapter* padapter )
{
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
u8 val8 = 1;
@ -3429,10 +3429,10 @@ _func_exit_;
}
#ifdef CONFIG_CONCURRENT_MODE
void p2p_concurrent_handler( _adapter* padapter )
void p2p_concurrent_handler( struct adapter* padapter )
{
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
//_adapter *pbuddy_adapter = padapter->pbuddy_adapter;
//struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
//struct wifidirect_info *pbuddy_wdinfo = &pbuddy_adapter->wdinfo;
//struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv;
//struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
@ -3441,7 +3441,7 @@ _func_enter_;
if ( check_buddy_fwstate(padapter, _FW_LINKED ) )
{
PADAPTER pbuddy_adapter = padapter->pbuddy_adapter;
struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
pwdinfo->operating_channel = pbuddy_mlmeext->cur_channel;
@ -3549,7 +3549,7 @@ _func_exit_;
#endif
#ifdef CONFIG_IOCTL_CFG80211
static void ro_ch_handler(_adapter *padapter)
static void ro_ch_handler(struct adapter *padapter)
{
struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo;
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
@ -3600,7 +3600,7 @@ _func_exit_;
static void ro_ch_timer_process (void *FunctionContext)
{
_adapter *adapter = (_adapter *)FunctionContext;
struct adapter *adapter = (struct adapter *)FunctionContext;
struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(adapter->rtw_wdev);
//printk("%s \n", __FUNCTION__);
@ -3612,11 +3612,11 @@ static void ro_ch_timer_process (void *FunctionContext)
p2p_protocol_wk_cmd( adapter, P2P_RO_CH_WK);
}
static void rtw_change_p2pie_op_ch(_adapter *padapter, const u8 *frame_body, u32 len, u8 ch)
static void rtw_change_p2pie_op_ch(struct adapter *padapter, const u8 *frame_body, u32 len, u8 ch)
{
u8 *ies, *p2p_ie;
u32 ies_len, p2p_ielen;
PADAPTER pbuddy_adapter = padapter->pbuddy_adapter;
struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
ies = (u8*)(frame_body + _PUBLIC_ACTION_IE_OFFSET_);
@ -3641,11 +3641,11 @@ static void rtw_change_p2pie_op_ch(_adapter *padapter, const u8 *frame_body, u32
}
}
static void rtw_change_p2pie_ch_list(_adapter *padapter, const u8 *frame_body, u32 len, u8 ch)
static void rtw_change_p2pie_ch_list(struct adapter *padapter, const u8 *frame_body, u32 len, u8 ch)
{
u8 *ies, *p2p_ie;
u32 ies_len, p2p_ielen;
PADAPTER pbuddy_adapter = padapter->pbuddy_adapter;
struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
ies = (u8*)(frame_body + _PUBLIC_ACTION_IE_OFFSET_);
@ -3681,13 +3681,13 @@ static void rtw_change_p2pie_ch_list(_adapter *padapter, const u8 *frame_body, u
}
}
static bool rtw_chk_p2pie_ch_list_with_buddy(_adapter *padapter, const u8 *frame_body, u32 len)
static bool rtw_chk_p2pie_ch_list_with_buddy(struct adapter *padapter, const u8 *frame_body, u32 len)
{
bool fit = _FALSE;
#ifdef CONFIG_CONCURRENT_MODE
u8 *ies, *p2p_ie;
u32 ies_len, p2p_ielen;
PADAPTER pbuddy_adapter = padapter->pbuddy_adapter;
struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
u8 buddy_ch = pbuddy_mlmeext->cur_channel;
@ -3731,13 +3731,13 @@ static bool rtw_chk_p2pie_ch_list_with_buddy(_adapter *padapter, const u8 *frame
return fit;
}
static bool rtw_chk_p2pie_op_ch_with_buddy(_adapter *padapter, const u8 *frame_body, u32 len)
static bool rtw_chk_p2pie_op_ch_with_buddy(struct adapter *padapter, const u8 *frame_body, u32 len)
{
bool fit = _FALSE;
#ifdef CONFIG_CONCURRENT_MODE
u8 *ies, *p2p_ie;
u32 ies_len, p2p_ielen;
PADAPTER pbuddy_adapter = padapter->pbuddy_adapter;
struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
u8 buddy_ch = pbuddy_mlmeext->cur_channel;
@ -3773,7 +3773,7 @@ static void rtw_cfg80211_adjust_p2pie_channel(_adapter *padapter, const u8 *fram
#ifdef CONFIG_CONCURRENT_MODE
u8 *ies, *p2p_ie;
u32 ies_len, p2p_ielen;
PADAPTER pbuddy_adapter = padapter->pbuddy_adapter;
struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
ies = (u8*)(frame_body + _PUBLIC_ACTION_IE_OFFSET_);
@ -3824,7 +3824,7 @@ static void rtw_cfg80211_adjust_p2pie_channel(_adapter *padapter, const u8 *fram
}
#ifdef CONFIG_WFD
void rtw_append_wfd_ie(_adapter *padapter, u8 *buf, u32* len)
void rtw_append_wfd_ie(struct adapter *padapter, u8 *buf, u32* len)
{
unsigned char *frame_body;
u8 category, action, OUI_Subtype, dialogToken=0;
@ -4003,7 +4003,7 @@ bool rtw_p2p_nego_intent_compare(u8 req, u8 resp)
return _FALSE;
}
int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx)
{
int is_p2p_frame = (-1);
unsigned char *frame_body;
@ -4373,7 +4373,7 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
return is_p2p_frame;
}
void rtw_init_cfg80211_wifidirect_info( _adapter* padapter)
void rtw_init_cfg80211_wifidirect_info( struct adapter* padapter)
{
struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo;
@ -4383,7 +4383,7 @@ void rtw_init_cfg80211_wifidirect_info( _adapter* padapter)
}
#endif //CONFIG_IOCTL_CFG80211
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);
@ -4472,7 +4472,7 @@ _func_exit_;
}
#ifdef CONFIG_P2P_PS
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;
@ -4583,7 +4583,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 = adapter_to_pwrctl(padapter);
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
@ -4643,7 +4643,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;
@ -4701,7 +4701,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))
@ -4720,7 +4720,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))
@ -4739,7 +4739,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))
@ -4750,7 +4750,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;
_irqL irqL;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@ -4795,7 +4795,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))
@ -4809,7 +4809,7 @@ static void find_phase_timer_process (void *FunctionContext)
#ifdef CONFIG_CONCURRENT_MODE
void ap_p2p_switch_timer_process (void *FunctionContext)
{
_adapter *adapter = (_adapter *)FunctionContext;
struct adapter *adapter = (struct adapter *)FunctionContext;
struct wifidirect_info *pwdinfo = &adapter->wdinfo;
#ifdef CONFIG_IOCTL_CFG80211
struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(adapter->rtw_wdev);
@ -4826,7 +4826,7 @@ void ap_p2p_switch_timer_process (void *FunctionContext)
}
#endif
void reset_global_wifidirect_info( _adapter* padapter )
void reset_global_wifidirect_info( struct adapter* padapter )
{
struct wifidirect_info *pwdinfo;
@ -4838,7 +4838,7 @@ void reset_global_wifidirect_info( _adapter* padapter )
}
#ifdef CONFIG_WFD
int rtw_init_wifi_display_info(_adapter* padapter)
int rtw_init_wifi_display_info(struct adapter* padapter)
{
int res = _SUCCESS;
struct wifi_display_info *pwfd_info = &padapter->wfd_info;
@ -4862,7 +4862,7 @@ int rtw_init_wifi_display_info(_adapter* padapter)
}
#endif //CONFIG_WFD
void rtw_init_wifidirect_timers(_adapter* padapter)
void rtw_init_wifidirect_timers(struct adapter* padapter)
{
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
@ -4876,7 +4876,7 @@ void rtw_init_wifidirect_timers(_adapter* padapter)
#endif
}
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;
@ -4891,14 +4891,14 @@ 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;
#ifdef CONFIG_WFD
struct wifi_display_info *pwfd_info = &padapter->wfd_info;
#endif
#ifdef CONFIG_CONCURRENT_MODE
_adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct wifidirect_info *pbuddy_wdinfo;
struct mlme_priv *pbuddy_mlmepriv;
struct mlme_ext_priv *pbuddy_mlmeext;
@ -5204,7 +5204,7 @@ void dbg_rtw_p2p_set_role(struct wifidirect_info *wdinfo, enum P2P_ROLE role, co
#endif //CONFIG_DBG_P2P
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);
@ -5215,7 +5215,7 @@ int rtw_p2p_enable(_adapter *padapter, enum P2P_ROLE role)
u16 bwmode;
#ifdef CONFIG_CONCURRENT_MODE
_adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct wifidirect_info *pbuddy_wdinfo = &pbuddy_adapter->wdinfo;
// Commented by Albert 2011/12/30
// The driver just supports 1 P2P group operation.

96
core/rtw_pwrctrl.c
View file

@ -29,7 +29,7 @@
#endif
#ifdef CONFIG_IPS
void _ips_enter(_adapter * padapter)
void _ips_enter(struct adapter * padapter)
{
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
@ -64,7 +64,7 @@ void _ips_enter(_adapter * padapter)
}
void ips_enter(_adapter * padapter)
void ips_enter(struct adapter * padapter)
{
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
@ -73,7 +73,7 @@ void ips_enter(_adapter * padapter)
_exit_pwrlock(&pwrpriv->lock);
}
int _ips_leave(_adapter * padapter)
int _ips_leave(struct adapter * padapter)
{
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
int result = _SUCCESS;
@ -100,7 +100,7 @@ int _ips_leave(_adapter * padapter)
return result;
}
int ips_leave(_adapter * padapter)
int ips_leave(struct adapter * padapter)
{
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
int ret;
@ -114,18 +114,18 @@ int ips_leave(_adapter * padapter)
#endif /* CONFIG_IPS */
#ifdef CONFIG_AUTOSUSPEND
extern void autosuspend_enter(_adapter* padapter);
extern int autoresume_enter(_adapter* padapter);
extern void autosuspend_enter(struct adapter* padapter);
extern int autoresume_enter(struct adapter* padapter);
#endif
#ifdef SUPPORT_HW_RFOFF_DETECTED
int rtw_hw_suspend(_adapter *padapter );
int rtw_hw_resume(_adapter *padapter);
int rtw_hw_suspend(struct adapter *padapter );
int rtw_hw_resume(struct adapter *padapter);
#endif
bool rtw_pwr_unassociated_idle(_adapter *adapter)
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);
struct xmit_priv *pxmit_priv = &adapter->xmitpriv;
#ifdef CONFIG_P2P
@ -204,7 +204,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 );
@ -334,7 +334,7 @@ exit:
void pwr_state_check_handler(void *FunctionContext)
{
_adapter *padapter = (_adapter *)FunctionContext;
struct adapter *padapter = (struct adapter *)FunctionContext;
rtw_ps_cmd(padapter);
}
@ -346,7 +346,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 = adapter_to_pwrctl(padapter);
@ -477,8 +477,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 = adapter_to_pwrctl(padapter);
@ -524,7 +524,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 = adapter_to_pwrctl(padapter);
#ifdef CONFIG_P2P
@ -688,7 +688,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;
@ -725,11 +725,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 = adapter_to_pwrctl(padapter);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
_adapter *buddy = padapter->pbuddy_adapter;
struct adapter *buddy = padapter->pbuddy_adapter;
_func_enter_;
@ -794,7 +794,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
@ -834,7 +834,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(IN PADAPTER Adapter)
void LeaveAllPowerSaveMode(IN struct adapter *Adapter)
{
struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv);
u8 enqueue = 0;
@ -893,7 +893,7 @@ _func_exit_;
#ifdef CONFIG_LPS_LCLK
void LPS_Leave_check(
PADAPTER padapter)
struct adapter *padapter)
{
struct pwrctrl_priv *pwrpriv;
u32 start_time;
@ -947,7 +947,7 @@ _func_exit_;
* using to update cpwn of drv; and drv willl make a decision to up or down pwr level
*/
void cpwm_int_hdl(
PADAPTER padapter,
struct adapter *padapter,
struct reportpwrstate_parm *preportpwrstate)
{
struct pwrctrl_priv *pwrpriv;
@ -1000,7 +1000,7 @@ static void cpwm_event_callback(struct work_struct *work)
{
struct pwrctrl_priv *pwrpriv = container_of(work, struct pwrctrl_priv, cpwm_event);
struct dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv);
_adapter *adapter = dvobj->if1;
struct adapter *adapter = dvobj->if1;
struct reportpwrstate_parm report;
//DBG_871X("%s\n",__FUNCTION__);
@ -1012,7 +1012,7 @@ static void cpwm_event_callback(struct work_struct *work)
#ifdef CONFIG_LPS_RPWM_TIMER
static void rpwmtimeout_workitem_callback(struct work_struct *work)
{
PADAPTER padapter;
struct adapter *padapter;
struct dvobj_priv *dvobj;
struct pwrctrl_priv *pwrpriv;
@ -1065,7 +1065,7 @@ exit:
*/
static void pwr_rpwm_timeout_handler(void *FunctionContext)
{
PADAPTER padapter;
struct adapter *padapter;
struct pwrctrl_priv *pwrpriv;
@ -1106,7 +1106,7 @@ __inline static void unregister_task_alive(struct pwrctrl_priv *pwrctrl, u32 tag
* _SUCCESS rtw_xmit_thread can write fifo/txcmd afterwards.
* _FAIL rtw_xmit_thread can not do anything.
*/
s32 rtw_register_tx_alive(PADAPTER padapter)
s32 rtw_register_tx_alive(struct adapter *padapter)
{
s32 res;
struct pwrctrl_priv *pwrctrl;
@ -1172,7 +1172,7 @@ _func_exit_;
* _SUCCESS rtw_cmd_thread can issue cmds to firmware afterwards.
* _FAIL rtw_cmd_thread can not do anything.
*/
s32 rtw_register_cmd_alive(PADAPTER padapter)
s32 rtw_register_cmd_alive(struct adapter *padapter)
{
s32 res;
struct pwrctrl_priv *pwrctrl;
@ -1234,7 +1234,7 @@ _func_exit_;
* _SUCCESS
* _FAIL
*/
s32 rtw_register_rx_alive(PADAPTER padapter)
s32 rtw_register_rx_alive(struct adapter *padapter)
{
struct pwrctrl_priv *pwrctrl;
@ -1265,7 +1265,7 @@ _func_exit_;
* _SUCCESS
* _FAIL
*/
s32 rtw_register_evt_alive(PADAPTER padapter)
s32 rtw_register_evt_alive(struct adapter *padapter)
{
struct pwrctrl_priv *pwrctrl;
@ -1294,7 +1294,7 @@ _func_exit_;
* No more pkts for TX,
* Then driver shall call this fun. to power down firmware again.
*/
void rtw_unregister_tx_alive(PADAPTER padapter)
void rtw_unregister_tx_alive(struct adapter *padapter)
{
struct pwrctrl_priv *pwrctrl;
@ -1332,7 +1332,7 @@ _func_exit_;
* and no more command to do,
* then driver shall call this fun. to power down firmware again.
*/
void rtw_unregister_cmd_alive(PADAPTER padapter)
void rtw_unregister_cmd_alive(struct adapter *padapter)
{
struct pwrctrl_priv *pwrctrl;
@ -1366,7 +1366,7 @@ _func_exit_;
/*
* Caller: ISR
*/
void rtw_unregister_rx_alive(PADAPTER padapter)
void rtw_unregister_rx_alive(struct adapter *padapter)
{
struct pwrctrl_priv *pwrctrl;
@ -1387,7 +1387,7 @@ _func_enter_;
_func_exit_;
}
void rtw_unregister_evt_alive(PADAPTER padapter)
void rtw_unregister_evt_alive(struct adapter *padapter)
{
struct pwrctrl_priv *pwrctrl;
@ -1411,7 +1411,7 @@ _func_exit_;
static void resume_workitem_callback(struct work_struct *work);
#endif //CONFIG_RESUME_IN_WORKQUEUE
void rtw_init_pwrctrl_priv(PADAPTER padapter)
void rtw_init_pwrctrl_priv(struct adapter *padapter)
{
struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter);
@ -1494,7 +1494,7 @@ _func_exit_;
}
void rtw_free_pwrctrl_priv(PADAPTER adapter)
void rtw_free_pwrctrl_priv(struct adapter *adapter)
{
struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(adapter);
@ -1527,13 +1527,13 @@ _func_exit_;
#ifdef CONFIG_RESUME_IN_WORKQUEUE
#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
extern int rtw_resume_process(_adapter *padapter);
extern int rtw_resume_process(struct adapter *padapter);
#endif
static void resume_workitem_callback(struct work_struct *work)
{
struct pwrctrl_priv *pwrpriv = container_of(work, struct pwrctrl_priv, resume_work);
struct dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv);
_adapter *adapter = dvobj->if1;
struct adapter *adapter = dvobj->if1;
DBG_871X("%s\n",__FUNCTION__);
@ -1575,7 +1575,7 @@ inline void rtw_set_do_late_resume(struct pwrctrl_priv *pwrpriv, bool enable)
#ifdef CONFIG_HAS_EARLYSUSPEND
#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
extern int rtw_resume_process(_adapter *padapter);
extern int rtw_resume_process(struct adapter *padapter);
#endif
static void rtw_early_suspend(struct early_suspend *h)
{
@ -1589,7 +1589,7 @@ static void rtw_late_resume(struct early_suspend *h)
{
struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend);
struct dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv);
_adapter *adapter = dvobj->if1;
struct adapter *adapter = dvobj->if1;
DBG_871X("%s\n",__FUNCTION__);
if(pwrpriv->do_late_resume) {
@ -1627,7 +1627,7 @@ void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv)
#ifdef CONFIG_ANDROID_POWER
#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
extern int rtw_resume_process(PADAPTER padapter);
extern int rtw_resume_process(struct adapter *padapter);
#endif
static void rtw_early_suspend(android_early_suspend_t *h)
{
@ -1641,7 +1641,7 @@ static void rtw_late_resume(android_early_suspend_t *h)
{
struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend);
struct dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv);
_adapter *adapter = dvobj->if1;
struct adapter *adapter = dvobj->if1;
DBG_871X("%s\n",__FUNCTION__);
if(pwrpriv->do_late_resume) {
@ -1677,7 +1677,7 @@ void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv)
}
#endif //CONFIG_ANDROID_POWER
u8 rtw_interface_ps_func(_adapter *padapter,HAL_INTF_PS_FUNC efunc_id,u8* val)
u8 rtw_interface_ps_func(struct adapter *padapter,HAL_INTF_PS_FUNC efunc_id,u8* val)
{
u8 bResult = _TRUE;
rtw_hal_intf_ps_func(padapter,efunc_id,val);
@ -1686,7 +1686,7 @@ u8 rtw_interface_ps_func(_adapter *padapter,HAL_INTF_PS_FUNC efunc_id,u8* val)
}
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 = adapter_to_pwrctl(padapter);
pwrpriv->ips_deny_time = rtw_get_current_time() + rtw_ms_to_systime(ms);
@ -1694,12 +1694,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 = adapter_to_pwrctl(padapter);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -1851,7 +1851,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 = adapter_to_pwrctl(padapter);
@ -1880,7 +1880,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 = adapter_to_pwrctl(padapter);

114
core/rtw_recv.c
View file

@ -62,7 +62,7 @@ _func_exit_;
}
sint _rtw_init_recv_priv(struct recv_priv *precvpriv, _adapter *padapter)
sint _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
{
sint i;
@ -165,7 +165,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_;
@ -190,7 +190,7 @@ union recv_frame *_rtw_alloc_recvframe (_queue *pfree_recv_queue)
union recv_frame *precvframe;
_list *plist, *phead;
_adapter *padapter;
struct adapter *padapter;
struct recv_priv *precvpriv;
_func_enter_;
@ -246,7 +246,7 @@ void rtw_init_recvframe(union recv_frame *precvframe, struct recv_priv *precvpri
int rtw_free_recvframe(union recv_frame *precvframe, _queue *pfree_recv_queue)
{
_irqL irqL;
_adapter *padapter=precvframe->u.hdr.adapter;
struct adapter *padapter=precvframe->u.hdr.adapter;
struct recv_priv *precvpriv = &padapter->recvpriv;
_func_enter_;
@ -299,7 +299,7 @@ _func_exit_;
sint _rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue)
{
_adapter *padapter=precvframe->u.hdr.adapter;
struct adapter *padapter=precvframe->u.hdr.adapter;
struct recv_priv *precvpriv = &padapter->recvpriv;
_func_enter_;
@ -380,7 +380,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;
@ -469,8 +469,8 @@ struct recv_buf *rtw_dequeue_recvbuf (_queue *queue)
}
sint recvframe_chkmic(_adapter *adapter, union recv_frame *precvframe);
sint recvframe_chkmic(_adapter *adapter, union recv_frame *precvframe){
sint recvframe_chkmic(struct adapter *adapter, union recv_frame *precvframe);
sint recvframe_chkmic(struct adapter *adapter, union recv_frame *precvframe){
sint i,res=_SUCCESS;
u32 datalen;
@ -616,8 +616,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;
@ -736,8 +736,8 @@ _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(_adapter *adapter,union recv_frame * precv_frame)
union recv_frame * portctrl(struct 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;
@ -862,8 +862,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;
@ -908,8 +908,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;
@ -982,7 +982,7 @@ void process_wmmps_data(_adapter *padapter, union recv_frame *precv_frame)
}
#ifdef CONFIG_TDLS
sint OnTDLS(_adapter *adapter, union recv_frame *precv_frame)
sint OnTDLS(struct adapter *adapter, union recv_frame *precv_frame)
{
struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib;
sint ret = _SUCCESS;
@ -1074,8 +1074,8 @@ exit:
}
#endif
void count_rx_stats(_adapter *padapter, union recv_frame *prframe, struct sta_info*sta);
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);
void count_rx_stats(struct adapter *padapter, union recv_frame *prframe, struct sta_info*sta)
{
int sz;
struct sta_info *psta = NULL;
@ -1108,12 +1108,12 @@ void count_rx_stats(_adapter *padapter, union recv_frame *prframe, struct sta_in
}
sint sta2sta_data_frame(
_adapter *adapter,
struct adapter *adapter,
union recv_frame *precv_frame,
struct sta_info**psta
);
sint sta2sta_data_frame(
_adapter *adapter,
struct adapter *adapter,
union recv_frame *precv_frame,
struct sta_info**psta
)
@ -1324,11 +1324,11 @@ _func_exit_;
}
sint ap2sta_data_frame(
_adapter *adapter,
struct adapter *adapter,
union recv_frame *precv_frame,
struct sta_info**psta );
sint ap2sta_data_frame(
_adapter *adapter,
struct adapter *adapter,
union recv_frame *precv_frame,
struct sta_info**psta )
{
@ -1481,11 +1481,11 @@ _func_exit_;
}
sint sta2ap_data_frame(
_adapter *adapter,
struct adapter *adapter,
union recv_frame *precv_frame,
struct sta_info**psta );
sint sta2ap_data_frame(
_adapter *adapter,
struct adapter *adapter,
union recv_frame *precv_frame,
struct sta_info**psta )
{
@ -1552,8 +1552,8 @@ _func_exit_;
}
sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame);
sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame)
sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_frame);
sint 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;
@ -1720,9 +1720,9 @@ sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame)
}
union recv_frame* recvframe_chk_defrag(PADAPTER padapter, union recv_frame *precv_frame);
sint validate_recv_mgnt_frame(PADAPTER padapter, union recv_frame *precv_frame);
sint validate_recv_mgnt_frame(PADAPTER padapter, union recv_frame *precv_frame)
union recv_frame* recvframe_chk_defrag(struct adapter *padapter, union recv_frame *precv_frame);
sint validate_recv_mgnt_frame(struct adapter *padapter, union recv_frame *precv_frame);
sint validate_recv_mgnt_frame(struct adapter *padapter, union recv_frame *precv_frame)
{
//struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -1826,8 +1826,8 @@ sint validate_recv_mgnt_frame(PADAPTER padapter, union recv_frame *precv_frame)
}
sint validate_recv_data_frame(_adapter *adapter, union recv_frame *precv_frame);
sint validate_recv_data_frame(_adapter *adapter, union recv_frame *precv_frame)
sint validate_recv_data_frame(struct adapter *adapter, union recv_frame *precv_frame);
sint validate_recv_data_frame(struct adapter *adapter, union recv_frame *precv_frame)
{
u8 bretry;
u8 *psa, *pda, *pbssid;
@ -1998,7 +1998,7 @@ _func_exit_;
}
#ifdef CONFIG_IEEE80211W
static sint validate_80211w_mgmt(_adapter *adapter, union recv_frame *precv_frame)
static sint validate_80211w_mgmt(struct adapter *adapter, union recv_frame *precv_frame)
{
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib;
@ -2118,8 +2118,8 @@ validate_80211w_fail:
}
#endif //CONFIG_IEEE80211W
sint validate_recv_frame(_adapter *adapter, union recv_frame *precv_frame);
sint validate_recv_frame(_adapter *adapter, union recv_frame *precv_frame)
sint validate_recv_frame(struct adapter *adapter, union recv_frame *precv_frame);
sint validate_recv_frame(struct adapter *adapter, union recv_frame *precv_frame)
{
//shall check frame subtype, to / from ds, da, bssid
@ -2339,7 +2339,7 @@ sint wlanhdr_to_ethhdr ( union recv_frame *precvframe)
struct ieee80211_snap_hdr *psnap;
sint 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
@ -2417,7 +2417,7 @@ sint wlanhdr_to_ethhdr ( union recv_frame *precvframe)
struct ieee80211_snap_hdr *psnap;
sint 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
@ -2541,7 +2541,7 @@ _func_exit_;
#if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
static void recvframe_expand_pkt(
PADAPTER padapter,
struct adapter *padapter,
union recv_frame *prframe)
{
struct recv_frame_hdr *pfhdr;
@ -2591,8 +2591,8 @@ static void recvframe_expand_pkt(
#endif
//perform defrag
union recv_frame * recvframe_defrag(_adapter *adapter,_queue *defrag_q);
union recv_frame * recvframe_defrag(_adapter *adapter,_queue *defrag_q)
union recv_frame * recvframe_defrag(struct adapter *adapter,_queue *defrag_q);
union recv_frame * recvframe_defrag(struct adapter *adapter,_queue *defrag_q)
{
_list *plist, *phead;
u8 *data,wlanhdr_offset;
@ -2686,7 +2686,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;
@ -2815,8 +2815,8 @@ _func_exit_;
#define ENDIAN_FREE 1
int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe);
int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe);
int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe)
{
int a_len, padding_len;
u16 eth_type, nSubframe_Length;
@ -2961,7 +2961,7 @@ int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
if( br_port && (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) )
{
int nat25_handle_frame(_adapter *priv, struct sk_buff *skb);
int nat25_handle_frame(struct adapter *priv, struct sk_buff *skb);
if (nat25_handle_frame(padapter, sub_skb) == -1) {
//priv->ext_stats.rx_data_drops++;
//DEBUG_ERR("RX DROP: nat25_handle_frame fail!\n");
@ -3133,8 +3133,8 @@ int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union rec
}
int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced);
int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced)
int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced);
int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced)
{
//_irqL irql;
//u8 bcancelled;
@ -3302,8 +3302,8 @@ int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *pre
}
int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe);
int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *prframe);
int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *prframe)
{
_irqL irql;
int retval = _SUCCESS;
@ -3479,7 +3479,7 @@ void rtw_reordering_ctrl_timeout_handler(void *pcontext)
{
_irqL irql;
struct recv_reorder_ctrl *preorder_ctrl = (struct recv_reorder_ctrl *)pcontext;
_adapter *padapter = preorder_ctrl->padapter;
struct adapter *padapter = preorder_ctrl->padapter;
_queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
@ -3501,8 +3501,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;
@ -3577,7 +3577,7 @@ int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe)
}
int recv_func_prehandle(_adapter *padapter, union recv_frame *rframe)
int recv_func_prehandle(struct adapter *padapter, union recv_frame *rframe)
{
int ret = _SUCCESS;
struct rx_pkt_attrib *pattrib = &rframe->u.hdr.attrib;
@ -3598,7 +3598,7 @@ exit:
return ret;
}
int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
int recv_func_posthandle(struct adapter *padapter, union recv_frame *prframe)
{
int ret = _SUCCESS;
union recv_frame *orig_prframe = prframe;
@ -3768,8 +3768,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;
@ -3827,7 +3827,7 @@ exit:
s32 rtw_recv_entry(union recv_frame *precvframe)
{
_adapter *padapter;
struct adapter *padapter;
struct recv_priv *precvpriv;
s32 ret=_SUCCESS;
@ -3862,7 +3862,7 @@ _func_exit_;
#ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS
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;

22
core/rtw_security.c
View file

@ -160,7 +160,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];
@ -240,7 +240,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];
@ -648,7 +648,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;
@ -770,7 +770,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;
@ -1579,7 +1579,7 @@ _func_exit_;
u32 rtw_aes_encrypt(_adapter *padapter, u8 *pxmitframe)
u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
{ // exclude ICV
@ -1969,7 +1969,7 @@ _func_exit_;
return res;
}
u32 rtw_aes_decrypt(_adapter *padapter, u8 *precvframe)
u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
{ // exclude ICV
@ -2092,7 +2092,7 @@ exit:
}
#ifdef CONFIG_IEEE80211W
u32 rtw_BIP_verify(_adapter *padapter, u8 *precvframe)
u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe)
{
struct rx_pkt_attrib *pattrib = &((union recv_frame *)precvframe)->u.hdr.attrib;
u8 *pframe;
@ -2902,7 +2902,7 @@ int omac1_aes_128(u8 *key, u8 *data, size_t data_len, u8 *mac)
}
#ifdef CONFIG_TDLS
void wpa_tdls_generate_tpk(_adapter *padapter, struct sta_info *psta)
void wpa_tdls_generate_tpk(struct adapter *padapter, struct sta_info *psta)
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
u8 *SNonce = psta->SNonce;
@ -3073,7 +3073,7 @@ int tdls_verify_mic(u8 *kck, u8 trans_seq,
void rtw_use_tkipkey_handler(void *FunctionContext)
{
_adapter *padapter = (_adapter *)FunctionContext;
struct adapter *padapter = (struct adapter *)FunctionContext;
_func_enter_;
@ -3089,7 +3089,7 @@ _func_exit_;
}
/* Restore HW wep key setting according to key_mask */
void rtw_sec_restore_wep_key(_adapter *adapter)
void rtw_sec_restore_wep_key(struct adapter *adapter)
{
struct security_priv* securitypriv=&(adapter->securitypriv);
sint keyid;
@ -3106,7 +3106,7 @@ void rtw_sec_restore_wep_key(_adapter *adapter)
}
}
u8 rtw_handle_tkip_countermeasure(_adapter* adapter, const char *caller)
u8 rtw_handle_tkip_countermeasure(struct adapter* adapter, const char *caller)
{
struct security_priv* securitypriv=&(adapter->securitypriv);
u8 status = _SUCCESS;

24
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)
{
#if defined(DBG_CONFIG_ERROR_DETECT)
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
@ -33,7 +33,7 @@ void sreset_init_value(_adapter *padapter)
psrtpriv->last_tx_complete_time =0;
#endif
}
void sreset_reset_value(_adapter *padapter)
void sreset_reset_value(struct adapter *padapter)
{
#if defined(DBG_CONFIG_ERROR_DETECT)
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
@ -46,7 +46,7 @@ void sreset_reset_value(_adapter *padapter)
#endif
}
u8 sreset_get_wifi_status(_adapter *padapter)
u8 sreset_get_wifi_status(struct adapter *padapter)
{
#if defined(DBG_CONFIG_ERROR_DETECT)
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
@ -84,7 +84,7 @@ u8 sreset_get_wifi_status(_adapter *padapter)
#endif
}
void sreset_set_wifi_error_status(_adapter *padapter, u32 status)
void sreset_set_wifi_error_status(struct adapter *padapter, u32 status)
{
#if defined(DBG_CONFIG_ERROR_DETECT)
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
@ -92,7 +92,7 @@ void sreset_set_wifi_error_status(_adapter *padapter, u32 status)
#endif
}
void sreset_set_trigger_point(_adapter *padapter, s32 tgp)
void sreset_set_trigger_point(struct adapter *padapter, s32 tgp)
{
#if defined(DBG_CONFIG_ERROR_DETECT)
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
@ -100,7 +100,7 @@ void sreset_set_trigger_point(_adapter *padapter, s32 tgp)
#endif
}
bool sreset_inprogress(_adapter *padapter)
bool sreset_inprogress(struct adapter *padapter)
{
#if defined(DBG_CONFIG_ERROR_RESET)
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
@ -110,7 +110,7 @@ bool sreset_inprogress(_adapter *padapter)
#endif
}
void sreset_restore_security_station(_adapter *padapter)
void sreset_restore_security_station(struct adapter *padapter)
{
u8 EntryId = 0;
struct mlme_priv *mlmepriv = &padapter->mlmepriv;
@ -168,7 +168,7 @@ void sreset_restore_security_station(_adapter *padapter)
}
}
void sreset_restore_network_station(_adapter *padapter)
void sreset_restore_network_station(struct adapter *padapter)
{
struct mlme_priv *mlmepriv = &padapter->mlmepriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -235,7 +235,7 @@ void sreset_restore_network_station(_adapter *padapter)
}
void sreset_restore_network_status(_adapter *padapter)
void sreset_restore_network_status(struct adapter *padapter)
{
struct mlme_priv *mlmepriv = &padapter->mlmepriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -254,7 +254,7 @@ void sreset_restore_network_status(_adapter *padapter)
}
}
void sreset_stop_adapter(_adapter *padapter)
void sreset_stop_adapter(struct adapter *padapter)
{
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -285,7 +285,7 @@ void sreset_stop_adapter(_adapter *padapter)
}
void sreset_start_adapter(_adapter *padapter)
void sreset_start_adapter(struct adapter *padapter)
{
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -311,7 +311,7 @@ void sreset_start_adapter(_adapter *padapter)
}
void sreset_reset(_adapter *padapter)
void sreset_reset(struct adapter *padapter)
{
#ifdef DBG_CONFIG_ERROR_RESET
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);

10
core/rtw_sta_mgt.c
View file

@ -461,7 +461,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;
_irqL irqL0;
@ -659,7 +659,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)
{
_irqL irqL;
_list *plist, *phead;
@ -757,7 +757,7 @@ _func_exit_;
}
u32 rtw_init_bcmc_stainfo(_adapter* padapter)
u32 rtw_init_bcmc_stainfo(struct adapter* padapter)
{
struct sta_info *psta;
@ -799,7 +799,7 @@ _func_exit_;
}
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;
@ -811,7 +811,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

152
core/rtw_wlan_util.c
View file

@ -144,7 +144,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;
@ -245,8 +245,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;
@ -268,8 +268,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;
@ -304,7 +304,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];
@ -314,7 +314,7 @@ void get_rate_set(_adapter *padapter, unsigned char *pbssrate, int *bssrate_len)
}
void UpdateBrateTbl(
IN PADAPTER Adapter,
IN struct adapter * Adapter,
IN u8 *mBratesOS
)
{
@ -362,19 +362,19 @@ 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));
@ -382,17 +382,17 @@ 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)
{
#ifdef CONFIG_CONCURRENT_MODE
if(padapter->iface_type == IFACE_PORT1)
@ -406,12 +406,12 @@ void Set_MSR(_adapter *padapter, u8 type)
}
}
inline u8 rtw_get_oper_ch(_adapter *adapter)
inline u8 rtw_get_oper_ch(struct adapter *adapter)
{
return adapter_to_dvobj(adapter)->oper_channel;
}
inline void rtw_set_oper_ch(_adapter *adapter, u8 ch)
inline void rtw_set_oper_ch(struct adapter *adapter, u8 ch)
{
if (adapter_to_dvobj(adapter)->oper_channel != ch)
adapter_to_dvobj(adapter)->on_oper_ch_time = rtw_get_current_time();
@ -419,32 +419,32 @@ inline void rtw_set_oper_ch(_adapter *adapter, u8 ch)
adapter_to_dvobj(adapter)->oper_channel = ch;
}
inline u8 rtw_get_oper_bw(_adapter *adapter)
inline u8 rtw_get_oper_bw(struct adapter *adapter)
{
return adapter_to_dvobj(adapter)->oper_bwmode;
}
inline void rtw_set_oper_bw(_adapter *adapter, u8 bw)
inline void rtw_set_oper_bw(struct adapter *adapter, u8 bw)
{
adapter_to_dvobj(adapter)->oper_bwmode = bw;
}
inline u8 rtw_get_oper_choffset(_adapter *adapter)
inline u8 rtw_get_oper_choffset(struct adapter *adapter)
{
return adapter_to_dvobj(adapter)->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_to_dvobj(adapter)->oper_ch_offset = offset;
}
inline u32 rtw_get_on_oper_ch_time(_adapter *adapter)
inline u32 rtw_get_on_oper_ch_time(struct adapter *adapter)
{
return adapter_to_dvobj(adapter)->on_oper_ch_time;
}
inline u32 rtw_get_on_cur_ch_time(_adapter *adapter)
inline u32 rtw_get_on_cur_ch_time(struct adapter *adapter)
{
if (adapter->mlmeextpriv.cur_channel == adapter_to_dvobj(adapter)->oper_channel)
return adapter_to_dvobj(adapter)->on_oper_ch_time;
@ -452,7 +452,7 @@ inline u32 rtw_get_on_cur_ch_time(_adapter *adapter)
return 0;
}
void SelectChannel(_adapter *padapter, unsigned char channel)
void SelectChannel(struct adapter *padapter, unsigned char channel)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -474,7 +474,7 @@ void SelectChannel(_adapter *padapter, unsigned char channel)
#endif // CONFIG_DUALMAC_CONCURRENT
}
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;
@ -498,7 +498,7 @@ void SetBWMode(_adapter *padapter, unsigned short bwmode, unsigned char channel_
#endif // CONFIG_DUALMAC_CONCURRENT
}
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;
@ -584,7 +584,7 @@ u16 get_beacon_interval(WLAN_BSSID_EX *bss)
return le16_to_cpu(le_val);
}
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;
@ -605,7 +605,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);
@ -620,7 +620,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;
@ -655,19 +655,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);
}
#if 0
static u32 _ReadCAM(_adapter *padapter ,u32 addr)
static u32 _ReadCAM(struct adapter *padapter ,u32 addr)
{
u32 count = 0, cmd;
cmd = CAM_POLLINIG |addr ;
@ -682,7 +682,7 @@ static u32 _ReadCAM(_adapter *padapter ,u32 addr)
return rtw_read32(padapter,REG_CAMREAD);
}
#endif
void read_cam(_adapter *padapter ,u8 entry)
void read_cam(struct adapter *padapter ,u8 entry)
{
u32 j,count = 0, addr;
u32 cam_val[2]; //cam_val[0] is read_val, cam_val[1] is the address
@ -701,7 +701,7 @@ void read_cam(_adapter *padapter ,u8 entry)
}
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;
//unsigned int cmd;
@ -745,7 +745,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)
{
#if 0
u32 addr, val=0;
@ -776,7 +776,7 @@ void clear_cam_entry(_adapter *padapter, u8 entry)
#endif
}
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;
@ -795,7 +795,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);
@ -847,7 +847,7 @@ void flush_all_cam_entry(_adapter *padapter)
}
#if defined(CONFIG_P2P) && defined(CONFIG_WFD)
int WFD_info_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
int WFD_info_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
{
struct registry_priv *pregpriv = &padapter->registrypriv;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -882,7 +882,7 @@ int WFD_info_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
}
#endif
int WMM_param_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
int WMM_param_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
{
//struct registry_priv *pregpriv = &padapter->registrypriv;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -921,7 +921,7 @@ int WMM_param_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
}
void WMMOnAssocRsp(_adapter *padapter)
void WMMOnAssocRsp(struct adapter *padapter)
{
u8 ACI, ACM, AIFS, ECWMin, ECWMax, aSifsTime;
u8 acm_mask;
@ -1042,7 +1042,7 @@ void WMMOnAssocRsp(_adapter *padapter)
return;
}
static void bwmode_update_check(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
static void bwmode_update_check(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
{
#ifdef CONFIG_80211N_HT
unsigned char new_bwmode;
@ -1142,7 +1142,7 @@ static void bwmode_update_check(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pI
#endif //CONFIG_80211N_HT
}
void HT_caps_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
void HT_caps_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
{
#ifdef CONFIG_80211N_HT
unsigned int i;
@ -1229,7 +1229,7 @@ void HT_caps_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
return;
}
void HT_info_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
void HT_info_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
{
#ifdef CONFIG_80211N_HT
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -1251,7 +1251,7 @@ void HT_info_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
return;
}
void HTOnAssocRsp(_adapter *padapter)
void HTOnAssocRsp(struct adapter *padapter)
{
unsigned char max_AMPDU_len;
unsigned char min_MPDU_spacing;
@ -1337,7 +1337,7 @@ void HTOnAssocRsp(_adapter *padapter)
}
void ERP_IE_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
void ERP_IE_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -1349,7 +1349,7 @@ void ERP_IE_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs 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;
@ -1417,7 +1417,7 @@ int check_ap_tdls_prohibited(u8 *pframe, u8 pkt_len)
}
#endif //CONFIG_TDLS
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;
@ -1626,7 +1626,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;
@ -1680,7 +1680,7 @@ void update_beacon_info(_adapter *padapter, u8 *pframe, uint pkt_len, struct sta
}
#ifdef CONFIG_DFS
void process_csa_ie(_adapter *padapter, u8 *pframe, uint pkt_len)
void process_csa_ie(struct adapter *padapter, u8 *pframe, uint pkt_len)
{
unsigned int i;
unsigned int len;
@ -1709,7 +1709,7 @@ void process_csa_ie(_adapter *padapter, u8 *pframe, uint pkt_len)
}
#endif //CONFIG_DFS
unsigned int is_ap_in_tkip(_adapter *padapter)
unsigned int is_ap_in_tkip(struct adapter *padapter)
{
u32 i;
PNDIS_802_11_VARIABLE_IEs pIE;
@ -1754,7 +1754,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;
PNDIS_802_11_VARIABLE_IEs pIE;
@ -1798,7 +1798,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;
PNDIS_802_11_VARIABLE_IEs pIE;
@ -1938,7 +1938,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;
@ -1997,25 +1997,25 @@ unsigned char get_highest_mcs_rate(struct HT_caps_element *pHT_caps)
return i;
}
void Update_RA_Entry(_adapter *padapter, struct sta_info *psta)
void Update_RA_Entry(struct adapter *padapter, struct sta_info *psta)
{
rtw_hal_update_ra_mask(psta, 0);
}
void enable_rate_adaptive(_adapter *padapter, struct sta_info *psta);
void enable_rate_adaptive(_adapter *padapter, struct sta_info *psta)
void enable_rate_adaptive(struct adapter *padapter, struct sta_info *psta);
void enable_rate_adaptive(struct adapter *padapter, struct sta_info *psta)
{
Update_RA_Entry(padapter, psta);
}
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);
}
// 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)
{
NDIS_802_11_RATES_EX supported_rates;
#ifdef CONFIG_P2P
@ -2141,7 +2141,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);
@ -2173,7 +2173,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);
@ -2243,7 +2243,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;
@ -2309,8 +2309,8 @@ void update_wireless_mode(_adapter *padapter)
update_mgnt_tx_rate(padapter, IEEE80211_OFDM_RATE_6MB);
}
void fire_write_MAC_cmd(_adapter *padapter, unsigned int addr, unsigned int value);
void fire_write_MAC_cmd(_adapter *padapter, unsigned int addr, unsigned int value)
void fire_write_MAC_cmd(struct adapter *padapter, unsigned int addr, unsigned int value);
void fire_write_MAC_cmd(struct adapter *padapter, unsigned int addr, unsigned int value)
{
#if 0
struct cmd_obj *ph2c;
@ -2337,7 +2337,7 @@ void fire_write_MAC_cmd(_adapter *padapter, unsigned int addr, unsigned int valu
#endif
}
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);
@ -2353,7 +2353,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;
PNDIS_802_11_VARIABLE_IEs pIE;
@ -2380,7 +2380,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, start_seq, param;
@ -2431,18 +2431,18 @@ 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, 0);
}
void beacon_timing_control(_adapter *padapter)
void beacon_timing_control(struct adapter *padapter)
{
rtw_hal_bcn_related_reg_setting(padapter);
}
#if 0
unsigned int setup_beacon_frame(_adapter *padapter, unsigned char *beacon_frame)
unsigned int setup_beacon_frame(struct adapter *padapter, unsigned char *beacon_frame)
{
unsigned short ATIMWindow;
unsigned char *pframe;
@ -2543,9 +2543,9 @@ unsigned int setup_beacon_frame(_adapter *padapter, unsigned char *beacon_frame)
}
#endif
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);
@ -2575,15 +2575,15 @@ int rtw_handle_dualmac(_adapter *adapter, bool init)
if (dvobj->InterfaceNumber == 0) {
//set adapter_type/iface type
adapter->isprimary = _TRUE;
adapter->adapter_type = PRIMARY_ADAPTER;
adapter->adapter_type = PRIMARY_struct adapter;
adapter->iface_type = IFACE_PORT0;
DBG_871X("%s(): PRIMARY_ADAPTER\n",__FUNCTION__);
DBG_871X("%s(): PRIMARY_struct adapter\n",__FUNCTION__);
} else {
//set adapter_type/iface type
adapter->isprimary = _FALSE;
adapter->adapter_type = SECONDARY_ADAPTER;
adapter->adapter_type = SECONDARY_struct adapter;
adapter->iface_type = IFACE_PORT1;
DBG_871X("%s(): SECONDARY_ADAPTER\n",__FUNCTION__);
DBG_871X("%s(): SECONDARY_struct adapter\n",__FUNCTION__);
}
#endif
}else {
@ -2593,7 +2593,7 @@ exit:
return status;
}
#ifdef CONFIG_WOWLAN
void rtw_get_current_ip_address(PADAPTER padapter, u8 *pcurrentip)
void rtw_get_current_ip_address(struct adapter *padapter, u8 *pcurrentip)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -2615,7 +2615,7 @@ void rtw_get_current_ip_address(PADAPTER padapter, u8 *pcurrentip)
}
}
}
void rtw_get_sec_iv(PADAPTER padapter, u8*pcur_dot11txpn, u8 *StaAddr)
void rtw_get_sec_iv(struct adapter *padapter, u8*pcur_dot11txpn, u8 *StaAddr)
{
struct sta_info *psta;
struct security_priv *psecpriv = &padapter->securitypriv;
@ -2637,7 +2637,7 @@ void rtw_get_sec_iv(PADAPTER padapter, u8*pcur_dot11txpn, u8 *StaAddr)
DBG_871X("%s(): CurrentIV: 0x%016llx\n", __func__, psta->dot11txpn.val);
}
}
void rtw_set_sec_iv(PADAPTER padapter)
void rtw_set_sec_iv(struct adapter *padapter)
{
struct sta_info *psta;
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);

84
core/rtw_xmit.c
View file

@ -69,7 +69,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;
@ -366,7 +366,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;
@ -448,7 +448,7 @@ _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;
@ -674,7 +674,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, _pkt *pkt, struct pkt_attrib *pattrib)
static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib *pattrib)
{
uint i;
struct pkt_file pktfile;
@ -959,7 +959,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){
sint curfragnum,length;
u8 *pframe, *payload,mic[8];
struct mic_data micdata;
@ -1107,7 +1107,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;
@ -1147,7 +1147,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;
@ -1373,7 +1373,7 @@ _func_exit_;
return res;
}
s32 rtw_txframes_pending(_adapter *padapter)
s32 rtw_txframes_pending(struct adapter *padapter)
{
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -1383,7 +1383,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;
@ -1438,7 +1438,7 @@ s32 rtw_txframes_sta_ac_pending(_adapter *padapter, struct pkt_attrib *pattrib)
#ifdef CONFIG_TDLS
int rtw_build_tdls_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe, u8 action)
int rtw_build_tdls_ies(struct adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe, u8 action)
{
int res=_SUCCESS;
@ -1483,7 +1483,7 @@ int rtw_build_tdls_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *
return res;
}
s32 rtw_make_tdls_wlanhdr (_adapter *padapter , u8 *hdr, struct pkt_attrib *pattrib, u8 action)
s32 rtw_make_tdls_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pattrib, u8 action)
{
u16 *qc;
struct rtw_ieee80211_hdr *pwlanhdr = (struct rtw_ieee80211_hdr *)hdr;
@ -1590,7 +1590,7 @@ _func_exit_;
return res;
}
s32 rtw_xmit_tdls_coalesce(_adapter * padapter, struct xmit_frame * pxmitframe, u8 action)
s32 rtw_xmit_tdls_coalesce(struct adapter * padapter, struct xmit_frame * pxmitframe, u8 action)
{
s32 llc_sz;
@ -1728,7 +1728,7 @@ This sub-routine will perform all the following:
6. apply sw-encrypt, if necessary.
*/
s32 rtw_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe)
s32 rtw_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe)
{
struct pkt_file pktfile;
@ -1940,7 +1940,7 @@ _func_exit_;
#ifdef CONFIG_IEEE80211W
//broadcast or multicast management pkt use BIP, unicast management pkt use CCMP encryption
s32 rtw_mgmt_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe)
s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe)
{
struct pkt_file pktfile;
s32 frg_inx, frg_len, mpdu_len, llc_sz, mem_sz;
@ -2211,7 +2211,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;
@ -2260,7 +2260,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;
@ -2542,7 +2542,7 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)//(_queue *pf
struct xmit_frame *pxframe = NULL;
_list *plist, *phead;
_queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue;
_adapter *padapter = pxmitpriv->adapter;
struct adapter *padapter = pxmitpriv->adapter;
_func_enter_;
@ -2638,7 +2638,7 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram
{
_irqL irqL;
_queue *queue;
_adapter *padapter = pxmitpriv->adapter;
struct adapter *padapter = pxmitpriv->adapter;
_pkt *pndis_pkt = NULL;
_func_enter_;
@ -2721,7 +2721,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)
{
@ -2785,7 +2785,7 @@ struct xmit_frame* rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmi
struct tx_servq *ptxservq = NULL;
_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];
#ifdef CONFIG_USB_HCI
@ -2864,7 +2864,7 @@ _func_exit_;
return pxmitframe;
}
struct tx_servq *rtw_get_sta_pending(_adapter *padapter, struct sta_info *psta, sint up, u8 *ac)
struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info *psta, sint up, u8 *ac)
{
struct tx_servq *ptxservq=NULL;
@ -2912,7 +2912,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)
{
//_irqL irqL0;
u8 ac_index;
@ -2970,7 +2970,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;
@ -3032,7 +3032,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;
@ -3057,14 +3057,14 @@ _func_exit_;
}
#ifdef CONFIG_BR_EXT
int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb)
int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb)
{
struct sk_buff *skb = *pskb;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
_irqL irqL;
//if(check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE)
{
void dhcp_flag_bcast(_adapter *priv, struct sk_buff *skb);
void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb);
int res, is_vlan_tag=0, i, do_nat25=1;
unsigned short vlan_hdr=0;
void *br_port = NULL;
@ -3109,7 +3109,7 @@ int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb)
if (*((unsigned short *)(skb->data+MACADDRLEN*2)) == __constant_htons(ETH_P_IP)) {
if (memcmp(padapter->scdb_mac, skb->data+MACADDRLEN, MACADDRLEN)) {
void *scdb_findEntry(_adapter *priv, unsigned char *macAddr, unsigned char *ipAddr);
void *scdb_findEntry(struct adapter *priv, unsigned char *macAddr, unsigned char *ipAddr);
if ((padapter->scdb_entry = (struct nat25_network_db_entry *)scdb_findEntry(padapter,
skb->data+MACADDRLEN, skb->data+WLAN_ETHHDR_LEN+12)) != NULL) {
@ -3134,7 +3134,7 @@ int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb)
#endif // 1
if (do_nat25)
{
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);
if (nat25_db_handle(padapter, skb, NAT25_CHECK) == 0) {
struct sk_buff *newskb;
@ -3279,7 +3279,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;
@ -3302,7 +3302,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, _pkt **ppkt)
s32 rtw_xmit(struct adapter *padapter, _pkt **ppkt)
{
static u32 start = 0;
static u32 drop_cnt = 0;
@ -3401,7 +3401,7 @@ s32 rtw_xmit(_adapter *padapter, _pkt **ppkt)
}
#ifdef CONFIG_TDLS
sint xmitframe_enqueue_for_tdls_sleeping_sta(_adapter *padapter, struct xmit_frame *pxmitframe)
sint xmitframe_enqueue_for_tdls_sleeping_sta(struct adapter *padapter, struct xmit_frame *pxmitframe)
{
sint ret=_FALSE;
@ -3477,7 +3477,7 @@ sint xmitframe_enqueue_for_tdls_sleeping_sta(_adapter *padapter, struct xmit_fra
#if defined(CONFIG_AP_MODE) || defined(CONFIG_TDLS)
sint xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *pxmitframe)
sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_frame *pxmitframe)
{
_irqL irqL;
sint ret=_FALSE;
@ -3644,7 +3644,7 @@ sint xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *p
}
static void dequeue_xmitframes_to_sleeping_queue(_adapter *padapter, struct sta_info *psta, _queue *pframequeue)
static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struct sta_info *psta, _queue *pframequeue)
{
sint ret;
_list *plist, *phead;
@ -3683,7 +3683,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)
{
_irqL irqL0;
struct sta_info *psta_bmc;
@ -3746,7 +3746,7 @@ void stop_sta_xmit(_adapter *padapter, struct sta_info *psta)
}
void wakeup_sta_to_xmit(_adapter *padapter, struct sta_info *psta)
void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta)
{
_irqL irqL;
u8 update_mask=0, wmmps_ac=0;
@ -3925,7 +3925,7 @@ _exit:
}
void xmit_delivery_enabled_frames(_adapter *padapter, struct sta_info *psta)
void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *psta)
{
_irqL irqL;
u8 wmmps_ac=0;
@ -4032,7 +4032,7 @@ void enqueue_pending_xmitbuf(
{
_irqL irql;
_queue *pqueue;
_adapter *pri_adapter = pxmitpriv->adapter;
struct adapter *pri_adapter = pxmitpriv->adapter;
pqueue = &pxmitpriv->pending_xmitbuf_queue;
@ -4154,7 +4154,7 @@ sint check_pending_xmitbuf(
thread_return rtw_xmit_thread(thread_context context)
{
s32 err;
PADAPTER padapter;
struct adapter *padapter;
err = _SUCCESS;
@ -4237,7 +4237,7 @@ void rtw_sctx_done(struct submit_ctx **sctx)
#ifdef CONFIG_XMIT_ACK
#ifdef CONFIG_XMIT_ACK_POLLING
s32 c2h_evt_hdl(_adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter);
s32 c2h_evt_hdl(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter);
/**
* rtw_ack_tx_polling -
@ -4252,7 +4252,7 @@ int rtw_ack_tx_polling(struct xmit_priv *pxmitpriv, u32 timeout_ms)
{
int ret = _FAIL;
struct submit_ctx *pack_tx_ops = &pxmitpriv->ack_tx_ops;
_adapter *adapter = container_of(pxmitpriv, _adapter, xmitpriv);
struct adapter *adapter = container_of(pxmitpriv, struct adapter, xmitpriv);
pack_tx_ops->submit_time = rtw_get_current_time();
pack_tx_ops->timeout_ms = timeout_ms;
@ -4288,13 +4288,13 @@ int rtw_ack_tx_polling(struct xmit_priv *pxmitpriv, u32 timeout_ms)
#endif
#ifdef CONFIG_DETECT_C2H_BY_POLLING
s32 c2h_evt_hdl(_adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter);
s32 c2h_evt_hdl(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter);
#endif
int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms)
{
#ifdef CONFIG_DETECT_C2H_BY_POLLING
_adapter *adapter = container_of(pxmitpriv, _adapter, xmitpriv);
struct adapter *adapter = container_of(pxmitpriv, struct adapter, xmitpriv);
c2h_id_filter ccx_id_filter = rtw_hal_c2h_id_filter_ccx(adapter);
struct submit_ctx *pack_tx_ops = &pxmitpriv->ack_tx_ops;
u8 check_c2hcmd;