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

rtl8188eu: Convert some typedef statements from include/osdep_service.h

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-23 22:39:20 -05:00
parent a831dc1f7e
commit 41ad3e27c6
24 changed files with 147 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
core/rtw_ap.c
View file

@ -50,7 +50,7 @@ void init_mlme_ap_info(_adapter *padapter)
void free_mlme_ap_info(_adapter *padapter) void free_mlme_ap_info(_adapter *padapter)
{ {
_irqL irqL; unsigned long irqL;
struct sta_info *psta=NULL; struct sta_info *psta=NULL;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -280,7 +280,7 @@ static u8 chk_sta_is_alive(struct sta_info *psta)
void expire_timeout_chk(_adapter *padapter) void expire_timeout_chk(_adapter *padapter)
{ {
_irqL irqL; unsigned long irqL;
_list *phead, *plist; _list *phead, *plist;
u8 updated; u8 updated;
struct sta_info *psta=NULL; struct sta_info *psta=NULL;
@ -545,7 +545,7 @@ void add_RATid(_adapter *padapter, struct sta_info *psta, u8 rssi_level)
static void update_bmc_sta(_adapter *padapter) static void update_bmc_sta(_adapter *padapter)
{ {
_irqL irqL; unsigned long irqL;
u32 init_rate=0; u32 init_rate=0;
unsigned char network_type, raid; unsigned char network_type, raid;
int i, supportRateNum = 0; int i, supportRateNum = 0;
@ -634,7 +634,7 @@ static void update_bmc_sta(_adapter *padapter)
void update_sta_info_apmode(_adapter *padapter, struct sta_info *psta) void update_sta_info_apmode(_adapter *padapter, struct sta_info *psta)
{ {
_irqL irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@ -1205,7 +1205,7 @@ void rtw_set_macaddr_acl(_adapter *padapter, int mode)
int rtw_acl_add_sta(_adapter *padapter, u8 *addr) int rtw_acl_add_sta(_adapter *padapter, u8 *addr)
{ {
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
u8 added = false; u8 added = false;
int i, ret=0; int i, ret=0;
@ -1279,7 +1279,7 @@ int rtw_acl_add_sta(_adapter *padapter, u8 *addr)
int rtw_acl_remove_sta(_adapter *padapter, u8 *addr) int rtw_acl_remove_sta(_adapter *padapter, u8 *addr)
{ {
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
int i, ret=0; int i, ret=0;
struct rtw_wlan_acl_node *paclnode; struct rtw_wlan_acl_node *paclnode;
@ -1482,7 +1482,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(_adapter *padapter, u8 ie_id, u8 *oui, u8 tx)
{ {
_irqL irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv; struct mlme_priv *pmlmepriv;
struct mlme_ext_priv *pmlmeext; struct mlme_ext_priv *pmlmeext;
@ -1643,7 +1643,7 @@ void associated_clients_update(_adapter *padapter, u8 updated)
/* update associcated stations cap. */ /* update associcated stations cap. */
if (updated == true) if (updated == true)
{ {
_irqL irqL; unsigned long irqL;
_list *phead, *plist; _list *phead, *plist;
struct sta_info *psta=NULL; struct sta_info *psta=NULL;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
@ -1919,7 +1919,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(_adapter *padapter, struct sta_info *psta, bool active, u16 reason)
{ {
_irqL irqL; unsigned long irqL;
u8 beacon_updated = false; u8 beacon_updated = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@ -1964,7 +1964,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 (_adapter *padapter, u8 new_ch, u8 ch_offset)
{ {
_irqL irqL; unsigned long irqL;
_list *phead, *plist; _list *phead, *plist;
int ret=0; int ret=0;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
@ -2001,7 +2001,7 @@ int rtw_ap_inform_ch_switch (_adapter *padapter, u8 new_ch, u8 ch_offset)
int rtw_sta_flush(_adapter *padapter) int rtw_sta_flush(_adapter *padapter)
{ {
_irqL irqL; unsigned long irqL;
_list *phead, *plist; _list *phead, *plist;
int ret=0; int ret=0;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
@ -2149,7 +2149,7 @@ void start_ap_mode(_adapter *padapter)
void stop_ap_mode(_adapter *padapter) void stop_ap_mode(_adapter *padapter)
{ {
_irqL irqL; unsigned long irqL;
_list *phead, *plist; _list *phead, *plist;
struct rtw_wlan_acl_node *paclnode; struct rtw_wlan_acl_node *paclnode;
struct sta_info *psta=NULL; struct sta_info *psta=NULL;

16
core/rtw_br_ext.c
View file

@ -359,7 +359,7 @@ static __inline__ void __network_hash_link(_adapter *priv,
struct nat25_network_db_entry *ent, int hash) struct nat25_network_db_entry *ent, int hash)
{ {
/* Caller must _enter_critical_bh already! */ /* Caller must _enter_critical_bh already! */
/* _irqL irqL; */ /* unsigned long irqL; */
/* _enter_critical_bh(&priv->br_ext_lock, &irqL); */ /* _enter_critical_bh(&priv->br_ext_lock, &irqL); */
ent->next_hash = priv->nethash[hash]; ent->next_hash = priv->nethash[hash];
@ -375,7 +375,7 @@ static __inline__ void __network_hash_link(_adapter *priv,
static __inline__ void __network_hash_unlink(struct nat25_network_db_entry *ent) static __inline__ void __network_hash_unlink(struct nat25_network_db_entry *ent)
{ {
/* Caller must _enter_critical_bh already! */ /* Caller must _enter_critical_bh already! */
/* _irqL irqL; */ /* unsigned long irqL; */
/* _enter_critical_bh(&priv->br_ext_lock, &irqL); */ /* _enter_critical_bh(&priv->br_ext_lock, &irqL); */
*(ent->pprev_hash) = ent->next_hash; *(ent->pprev_hash) = ent->next_hash;
@ -392,7 +392,7 @@ static int __nat25_db_network_lookup_and_replace(_adapter *priv,
struct sk_buff *skb, unsigned char *networkAddr) struct sk_buff *skb, unsigned char *networkAddr)
{ {
struct nat25_network_db_entry *db; struct nat25_network_db_entry *db;
_irqL irqL; unsigned long irqL;
_enter_critical_bh(&priv->br_ext_lock, &irqL); _enter_critical_bh(&priv->br_ext_lock, &irqL);
db = priv->nethash[__nat25_network_hash(networkAddr)]; db = priv->nethash[__nat25_network_hash(networkAddr)];
@ -448,7 +448,7 @@ static void __nat25_db_network_insert(_adapter *priv,
{ {
struct nat25_network_db_entry *db; struct nat25_network_db_entry *db;
int hash; int hash;
_irqL irqL; unsigned long irqL;
_enter_critical_bh(&priv->br_ext_lock, &irqL); _enter_critical_bh(&priv->br_ext_lock, &irqL);
hash = __nat25_network_hash(networkAddr); hash = __nat25_network_hash(networkAddr);
@ -494,7 +494,7 @@ static void __nat25_db_print(_adapter *priv)
void nat25_db_cleanup(_adapter *priv) void nat25_db_cleanup(_adapter *priv)
{ {
int i; int i;
_irqL irqL; unsigned long irqL;
_enter_critical_bh(&priv->br_ext_lock, &irqL); _enter_critical_bh(&priv->br_ext_lock, &irqL);
for (i=0; i<NAT25_HASH_SIZE; i++) for (i=0; i<NAT25_HASH_SIZE; i++)
@ -525,7 +525,7 @@ void nat25_db_cleanup(_adapter *priv)
void nat25_db_expire(_adapter *priv) void nat25_db_expire(_adapter *priv)
{ {
int i; int i;
_irqL irqL; unsigned long irqL;
_enter_critical_bh(&priv->br_ext_lock, &irqL); _enter_critical_bh(&priv->br_ext_lock, &irqL);
/* if (!priv->ethBrExtInfo.nat25_disable) */ /* if (!priv->ethBrExtInfo.nat25_disable) */
@ -1265,7 +1265,7 @@ int nat25_handle_frame(_adapter *priv, struct sk_buff *skb)
if (!priv->ethBrExtInfo.nat25_disable) if (!priv->ethBrExtInfo.nat25_disable)
{ {
_irqL irqL; unsigned long irqL;
_enter_critical_bh(&priv->br_ext_lock, &irqL); _enter_critical_bh(&priv->br_ext_lock, &irqL);
/* /*
* This function look up the destination network address from * This function look up the destination network address from
@ -1386,7 +1386,7 @@ void *scdb_findEntry(_adapter *priv, unsigned char *macAddr,
unsigned char networkAddr[MAX_NETWORK_ADDR_LEN]; unsigned char networkAddr[MAX_NETWORK_ADDR_LEN];
struct nat25_network_db_entry *db; struct nat25_network_db_entry *db;
int hash; int hash;
/* _irqL irqL; */ /* unsigned long irqL; */
/* _enter_critical_bh(&priv->br_ext_lock, &irqL); */ /* _enter_critical_bh(&priv->br_ext_lock, &irqL); */
__nat25_generate_ipv4_network_addr(networkAddr, (unsigned int *)ipAddr); __nat25_generate_ipv4_network_addr(networkAddr, (unsigned int *)ipAddr);

12
core/rtw_cmd.c
View file

@ -156,7 +156,7 @@ ISR/Call-Back functions can't call this sub-function.
sint _rtw_enqueue_cmd(_queue *queue, struct cmd_obj *obj) sint _rtw_enqueue_cmd(_queue *queue, struct cmd_obj *obj)
{ {
_irqL irqL; unsigned long irqL;
_func_enter_; _func_enter_;
@ -180,7 +180,7 @@ _func_exit_;
struct cmd_obj *_rtw_dequeue_cmd(_queue *queue) struct cmd_obj *_rtw_dequeue_cmd(_queue *queue)
{ {
_irqL irqL; unsigned long irqL;
struct cmd_obj *obj; struct cmd_obj *obj;
_func_enter_; _func_enter_;
@ -2380,7 +2380,7 @@ _func_exit_;
} }
void rtw_disassoc_cmd_callback(_adapter* padapter, struct cmd_obj *pcmd) void rtw_disassoc_cmd_callback(_adapter* padapter, struct cmd_obj *pcmd)
{ {
_irqL irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_func_enter_; _func_enter_;
@ -2430,7 +2430,7 @@ _func_exit_;
void rtw_createbss_cmd_callback(_adapter *padapter, struct cmd_obj *pcmd) void rtw_createbss_cmd_callback(_adapter *padapter, struct cmd_obj *pcmd)
{ {
_irqL irqL; unsigned long irqL;
u8 timer_cancelled; u8 timer_cancelled;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
struct wlan_network *pwlan = NULL; struct wlan_network *pwlan = NULL;
@ -2462,7 +2462,7 @@ _func_enter_;
rtw_indicate_connect( padapter); rtw_indicate_connect( padapter);
} else { } else {
_irqL irqL; unsigned long irqL;
pwlan = _rtw_alloc_network(pmlmepriv); pwlan = _rtw_alloc_network(pmlmepriv);
_enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
@ -2526,7 +2526,7 @@ _func_exit_;
void rtw_setassocsta_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd) void rtw_setassocsta_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd)
{ {
_irqL irqL; unsigned long irqL;
struct sta_priv * pstapriv = &padapter->stapriv; struct sta_priv * pstapriv = &padapter->stapriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct set_assocsta_parm* passocsta_parm = (struct set_assocsta_parm*)(pcmd->parmbuf); struct set_assocsta_parm* passocsta_parm = (struct set_assocsta_parm*)(pcmd->parmbuf);

2
core/rtw_debug.c
View file

@ -905,7 +905,7 @@ int proc_get_all_sta_info(char *page, char **start,
off_t offset, int count, off_t offset, int count,
int *eof, void *data) int *eof, void *data)
{ {
_irqL irqL; unsigned long irqL;
struct sta_info *psta; struct sta_info *psta;
struct net_device *dev = data; struct net_device *dev = data;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev); _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);

12
core/rtw_ioctl_set.c
View file

@ -70,7 +70,7 @@ _func_exit_;
u8 rtw_do_join(_adapter * padapter); u8 rtw_do_join(_adapter * padapter);
u8 rtw_do_join(_adapter * padapter) u8 rtw_do_join(_adapter * padapter)
{ {
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
u8* pibss = NULL; u8* pibss = NULL;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -183,7 +183,7 @@ _func_exit_;
u8 rtw_set_802_11_bssid(_adapter* padapter, u8 *bssid) u8 rtw_set_802_11_bssid(_adapter* padapter, u8 *bssid)
{ {
_irqL irqL; unsigned long irqL;
u8 status=_SUCCESS; u8 status=_SUCCESS;
u32 cur_time = 0; u32 cur_time = 0;
@ -279,7 +279,7 @@ _func_exit_;
u8 rtw_set_802_11_ssid(_adapter* padapter, struct ndis_802_11_ssid *ssid) u8 rtw_set_802_11_ssid(_adapter* padapter, struct ndis_802_11_ssid *ssid)
{ {
_irqL irqL; unsigned long irqL;
u8 status = _SUCCESS; u8 status = _SUCCESS;
u32 cur_time = 0; u32 cur_time = 0;
@ -403,7 +403,7 @@ _func_exit_;
u8 rtw_set_802_11_infrastructure_mode(_adapter* padapter, u8 rtw_set_802_11_infrastructure_mode(_adapter* padapter,
enum ndis_802_11_network_infra networktype) enum ndis_802_11_network_infra networktype)
{ {
_irqL irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wlan_network *cur_network = &pmlmepriv->cur_network; struct wlan_network *cur_network = &pmlmepriv->cur_network;
enum ndis_802_11_network_infra* pold_state = &(cur_network->network.InfrastructureMode); enum ndis_802_11_network_infra* pold_state = &(cur_network->network.InfrastructureMode);
@ -483,7 +483,7 @@ _func_exit_;
u8 rtw_set_802_11_disassociate(_adapter *padapter) u8 rtw_set_802_11_disassociate(_adapter *padapter)
{ {
_irqL irqL; unsigned long irqL;
struct mlme_priv * pmlmepriv = &padapter->mlmepriv; struct mlme_priv * pmlmepriv = &padapter->mlmepriv;
_func_enter_; _func_enter_;
@ -509,7 +509,7 @@ _func_exit_;
u8 rtw_set_802_11_bssid_list_scan(_adapter* padapter, struct ndis_802_11_ssid *pssid, int ssid_max_num) u8 rtw_set_802_11_bssid_list_scan(_adapter* padapter, struct ndis_802_11_ssid *pssid, int ssid_max_num)
{ {
_irqL irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv= &padapter->mlmepriv; struct mlme_priv *pmlmepriv= &padapter->mlmepriv;
u8 res=true; u8 res=true;

38
core/rtw_mlme.c
View file

@ -150,7 +150,7 @@ _func_exit_;
sint _rtw_enqueue_network(_queue *queue, struct wlan_network *pnetwork) sint _rtw_enqueue_network(_queue *queue, struct wlan_network *pnetwork)
{ {
_irqL irqL; unsigned long irqL;
_func_enter_; _func_enter_;
@ -172,7 +172,7 @@ _func_exit_;
struct wlan_network *_rtw_dequeue_network(_queue *queue) struct wlan_network *_rtw_dequeue_network(_queue *queue)
{ {
_irqL irqL; unsigned long irqL;
struct wlan_network *pnetwork; struct wlan_network *pnetwork;
@ -200,7 +200,7 @@ _func_exit_;
struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv )/* _queue *free_queue) */ struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv )/* _queue *free_queue) */
{ {
_irqL irqL; unsigned long irqL;
struct wlan_network *pnetwork; struct wlan_network *pnetwork;
_queue *free_queue = &pmlmepriv->free_bss_pool; _queue *free_queue = &pmlmepriv->free_bss_pool;
_list* plist = NULL; _list* plist = NULL;
@ -240,7 +240,7 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv ,struct wlan_network *pnetwor
{ {
u32 curr_time, delta_time; u32 curr_time, delta_time;
u32 lifetime = SCANQUEUE_LIFETIME; u32 lifetime = SCANQUEUE_LIFETIME;
_irqL irqL; unsigned long irqL;
_queue *free_queue = &(pmlmepriv->free_bss_pool); _queue *free_queue = &(pmlmepriv->free_bss_pool);
_func_enter_; _func_enter_;
@ -355,7 +355,7 @@ _func_exit_;
void _rtw_free_network_queue(_adapter *padapter, u8 isfreeall) void _rtw_free_network_queue(_adapter *padapter, u8 isfreeall)
{ {
_irqL irqL; unsigned long irqL;
_list *phead, *plist; _list *phead, *plist;
struct wlan_network *pnetwork; struct wlan_network *pnetwork;
struct mlme_priv* pmlmepriv = &padapter->mlmepriv; struct mlme_priv* pmlmepriv = &padapter->mlmepriv;
@ -718,7 +718,7 @@ Caller must hold pmlmepriv->lock first.
*/ */
void rtw_update_scanned_network(_adapter *adapter, struct wlan_bssid_ex *target) void rtw_update_scanned_network(_adapter *adapter, struct wlan_bssid_ex *target)
{ {
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
ULONG bssid_ex_sz; ULONG bssid_ex_sz;
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
@ -826,7 +826,7 @@ _func_exit_;
void rtw_add_network(_adapter *adapter, struct wlan_bssid_ex *pnetwork) void rtw_add_network(_adapter *adapter, struct wlan_bssid_ex *pnetwork)
{ {
_irqL irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv = &(((_adapter *)adapter)->mlmepriv); struct mlme_priv *pmlmepriv = &(((_adapter *)adapter)->mlmepriv);
_func_enter_; _func_enter_;
@ -910,7 +910,7 @@ _func_exit_;
void rtw_survey_event_callback(_adapter *adapter, u8 *pbuf) void rtw_survey_event_callback(_adapter *adapter, u8 *pbuf)
{ {
_irqL irqL; unsigned long irqL;
u32 len; u32 len;
struct wlan_bssid_ex *pnetwork; struct wlan_bssid_ex *pnetwork;
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
@ -936,7 +936,7 @@ _func_enter_;
if (_rtw_memcmp(&(pmlmepriv->cur_network.network.MacAddress), pnetwork->MacAddress, ETH_ALEN)) if (_rtw_memcmp(&(pmlmepriv->cur_network.network.MacAddress), pnetwork->MacAddress, ETH_ALEN))
{ {
struct wlan_network* ibss_wlan = NULL; struct wlan_network* ibss_wlan = NULL;
_irqL irqL; unsigned long irqL;
_rtw_memcpy(pmlmepriv->cur_network.network.IEs, pnetwork->IEs, 8); _rtw_memcpy(pmlmepriv->cur_network.network.IEs, pnetwork->IEs, 8);
_enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
@ -974,7 +974,7 @@ _func_exit_;
void rtw_surveydone_event_callback(_adapter *adapter, u8 *pbuf) void rtw_surveydone_event_callback(_adapter *adapter, u8 *pbuf)
{ {
_irqL irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
#ifdef CONFIG_MLME_EXT #ifdef CONFIG_MLME_EXT
@ -1103,7 +1103,7 @@ void rtw_fwdbg_event_callback(_adapter *adapter , u8 *pbuf)
static void free_scanqueue(struct mlme_priv *pmlmepriv) static void free_scanqueue(struct mlme_priv *pmlmepriv)
{ {
_irqL irqL, irqL0; unsigned long irqL, irqL0;
_queue *free_queue = &pmlmepriv->free_bss_pool; _queue *free_queue = &pmlmepriv->free_bss_pool;
_queue *scan_queue = &pmlmepriv->scanned_queue; _queue *scan_queue = &pmlmepriv->scanned_queue;
_list *plist, *phead, *ptemp; _list *plist, *phead, *ptemp;
@ -1137,7 +1137,7 @@ _func_exit_;
*/ */
void rtw_free_assoc_resources(_adapter *adapter, int lock_scanned_queue) void rtw_free_assoc_resources(_adapter *adapter, int lock_scanned_queue)
{ {
_irqL irqL; unsigned long irqL;
struct wlan_network* pwlan = NULL; struct wlan_network* pwlan = NULL;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
struct sta_priv *pstapriv = &adapter->stapriv; struct sta_priv *pstapriv = &adapter->stapriv;
@ -1464,7 +1464,7 @@ static void rtw_joinbss_update_network(_adapter *padapter, struct wlan_network *
void rtw_joinbss_event_prehandle(_adapter *adapter, u8 *pbuf) void rtw_joinbss_event_prehandle(_adapter *adapter, u8 *pbuf)
{ {
_irqL irqL,irqL2; unsigned long irqL,irqL2;
u8 timer_cancelled; u8 timer_cancelled;
struct sta_info *ptarget_sta= NULL, *pcur_sta = NULL; struct sta_info *ptarget_sta= NULL, *pcur_sta = NULL;
struct sta_priv *pstapriv = &adapter->stapriv; struct sta_priv *pstapriv = &adapter->stapriv;
@ -1659,7 +1659,7 @@ void rtw_stassoc_hw_rpt(_adapter *adapter,struct sta_info *psta)
void rtw_stassoc_event_callback(_adapter *adapter, u8 *pbuf) void rtw_stassoc_event_callback(_adapter *adapter, u8 *pbuf)
{ {
_irqL irqL; unsigned long irqL;
struct sta_info *psta; struct sta_info *psta;
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
struct stassoc_event *pstassoc = (struct stassoc_event*)pbuf; struct stassoc_event *pstassoc = (struct stassoc_event*)pbuf;
@ -1750,7 +1750,7 @@ _func_exit_;
void rtw_stadel_event_callback(_adapter *adapter, u8 *pbuf) void rtw_stadel_event_callback(_adapter *adapter, u8 *pbuf)
{ {
_irqL irqL,irqL2; unsigned long irqL,irqL2;
int mac_id=-1; int mac_id=-1;
struct sta_info *psta; struct sta_info *psta;
struct wlan_network* pwlan = NULL; struct wlan_network* pwlan = NULL;
@ -1882,7 +1882,7 @@ _func_exit_;
*/ */
void _rtw_join_timeout_handler (_adapter *adapter) void _rtw_join_timeout_handler (_adapter *adapter)
{ {
_irqL irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
int do_join_r; int do_join_r;
@ -1928,7 +1928,7 @@ _func_exit_;
*/ */
void rtw_scan_timeout_handler (_adapter *adapter) void rtw_scan_timeout_handler (_adapter *adapter)
{ {
_irqL irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
DBG_88E(FUNC_ADPT_FMT" fw_state=%x\n", FUNC_ADPT_ARG(adapter), get_fwstate(pmlmepriv)); DBG_88E(FUNC_ADPT_FMT" fw_state=%x\n", FUNC_ADPT_ARG(adapter), get_fwstate(pmlmepriv));
@ -2104,7 +2104,7 @@ pmlmepriv->lock
int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv ) int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv )
{ {
_irqL irqL; unsigned long irqL;
int ret; int ret;
_list *phead; _list *phead;
_adapter *adapter; _adapter *adapter;
@ -2852,7 +2852,7 @@ void rtw_issue_addbareq_cmd(_adapter *padapter, struct xmit_frame *pxmitframe)
void rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network) void rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network)
{ {
_irqL irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_enter_critical_bh(&pmlmepriv->lock, &irqL); _enter_critical_bh(&pmlmepriv->lock, &irqL);

16
core/rtw_mlme_ext.c
View file

@ -917,7 +917,7 @@ _END_ONBEACON_:
unsigned int OnAuth(_adapter *padapter, union recv_frame *precv_frame) unsigned int OnAuth(_adapter *padapter, union recv_frame *precv_frame)
{ {
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
_irqL irqL; unsigned long irqL;
unsigned int auth_mode, ie_len; unsigned int auth_mode, ie_len;
u16 seq; u16 seq;
unsigned char *sa, *p; unsigned char *sa, *p;
@ -1201,7 +1201,7 @@ authclnt_fail:
unsigned int OnAssocReq(_adapter *padapter, union recv_frame *precv_frame) unsigned int OnAssocReq(_adapter *padapter, union recv_frame *precv_frame)
{ {
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
_irqL irqL; unsigned long irqL;
u16 capab_info; u16 capab_info;
struct rtw_ieee802_11_elems elems; struct rtw_ieee802_11_elems elems;
struct sta_info *pstat; struct sta_info *pstat;
@ -1858,7 +1858,7 @@ unsigned int OnDeAuth(_adapter *padapter, union recv_frame *precv_frame)
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
{ {
_irqL irqL; unsigned long irqL;
struct sta_info *psta; struct sta_info *psta;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
@ -1933,7 +1933,7 @@ unsigned int OnDisassoc(_adapter *padapter, union recv_frame *precv_frame)
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
{ {
_irqL irqL; unsigned long irqL;
struct sta_info *psta; struct sta_info *psta;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
@ -5157,7 +5157,7 @@ void issue_beacon(_adapter *padapter, int timeout_ms)
unsigned int rate_len; unsigned int rate_len;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
#if defined (CONFIG_AP_MODE) #if defined (CONFIG_AP_MODE)
_irqL irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
#endif /* if defined (CONFIG_AP_MODE) */ #endif /* if defined (CONFIG_AP_MODE) */
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@ -6760,7 +6760,7 @@ exit:
void issue_action_spct_ch_switch (_adapter *padapter, u8 *ra, u8 new_ch, u8 ch_offset) void issue_action_spct_ch_switch (_adapter *padapter, u8 *ra, u8 new_ch, u8 ch_offset)
{ {
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
struct xmit_frame *pmgntframe; struct xmit_frame *pmgntframe;
struct pkt_attrib *pattrib; struct pkt_attrib *pattrib;
@ -6984,7 +6984,7 @@ void issue_action_BA(_adapter *padapter, unsigned char *raddr, unsigned char act
static void issue_action_BSSCoexistPacket(_adapter *padapter) static void issue_action_BSSCoexistPacket(_adapter *padapter)
{ {
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
unsigned char category, action; unsigned char category, action;
struct xmit_frame *pmgntframe; struct xmit_frame *pmgntframe;
@ -9576,7 +9576,7 @@ u8 tx_beacon_hdl(_adapter *padapter, unsigned char *pbuf)
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
else /* tx bc/mc frames after update TIM */ else /* tx bc/mc frames after update TIM */
{ {
_irqL irqL; unsigned long irqL;
struct sta_info *psta_bmc; struct sta_info *psta_bmc;
_list *xmitframe_plist, *xmitframe_phead; _list *xmitframe_plist, *xmitframe_phead;
struct xmit_frame *pxmitframe=NULL; struct xmit_frame *pxmitframe=NULL;

4
core/rtw_mp.c
View file

@ -383,7 +383,7 @@ s32 mp_start_test(PADAPTER padapter)
u32 length; u32 length;
u8 val8; u8 val8;
_irqL irqL; unsigned long irqL;
s32 res = _SUCCESS; s32 res = _SUCCESS;
struct mp_priv *pmppriv = &padapter->mppriv; struct mp_priv *pmppriv = &padapter->mppriv;
@ -498,7 +498,7 @@ void mp_stop_test(PADAPTER padapter)
struct wlan_network *tgt_network = &pmlmepriv->cur_network; struct wlan_network *tgt_network = &pmlmepriv->cur_network;
struct sta_info *psta; struct sta_info *psta;
_irqL irqL; unsigned long irqL;
if (pmppriv->mode==MP_ON) if (pmppriv->mode==MP_ON)
{ {

10
core/rtw_p2p.c
View file

@ -42,7 +42,7 @@ static int rtw_p2p_is_channel_list_ok( u8 desired_ch, u8* ch_list, u8 ch_cnt )
static int is_any_client_associated( _adapter *padapter) static int is_any_client_associated( _adapter *padapter)
{ {
_irqL irqL; unsigned long irqL;
_list *phead, *plist; _list *phead, *plist;
int intFound = false; int intFound = false;
@ -75,7 +75,7 @@ static int is_any_client_associated( _adapter *padapter)
static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf) static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf)
{ {
_irqL irqL; unsigned long irqL;
_list *phead, *plist; _list *phead, *plist;
u32 len=0; u32 len=0;
u16 attr_len = 0; u16 attr_len = 0;
@ -1073,7 +1073,7 @@ u32 process_p2p_devdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le
attr_contentlen=0; attr_contentlen=0;
if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_DEVICE_ID, dev_addr, &attr_contentlen)) if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_DEVICE_ID, dev_addr, &attr_contentlen))
{ {
_irqL irqL; unsigned long irqL;
_list *phead, *plist; _list *phead, *plist;
_enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL);
@ -1708,7 +1708,7 @@ static void find_phase_handler( _adapter* padapter )
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct ndis_802_11_ssid ssid; struct ndis_802_11_ssid ssid;
_irqL irqL; unsigned long irqL;
_func_enter_; _func_enter_;
@ -2076,7 +2076,7 @@ static void pre_tx_scan_timer_process (void *FunctionContext)
{ {
_adapter *adapter = (_adapter *) FunctionContext; _adapter *adapter = (_adapter *) FunctionContext;
struct wifidirect_info *pwdinfo = &adapter->wdinfo; struct wifidirect_info *pwdinfo = &adapter->wdinfo;
_irqL irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
u8 _status = 0; u8 _status = 0;

20
core/rtw_recv.c
View file

@ -182,7 +182,7 @@ _func_exit_;
union recv_frame *rtw_alloc_recvframe (_queue *pfree_recv_queue) union recv_frame *rtw_alloc_recvframe (_queue *pfree_recv_queue)
{ {
_irqL irqL; unsigned long irqL;
union recv_frame *precvframe; union recv_frame *precvframe;
_enter_critical_bh(&pfree_recv_queue->lock, &irqL); _enter_critical_bh(&pfree_recv_queue->lock, &irqL);
@ -204,7 +204,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) int rtw_free_recvframe(union recv_frame *precvframe, _queue *pfree_recv_queue)
{ {
_irqL irqL; unsigned long irqL;
_adapter *padapter=precvframe->u.hdr.adapter; _adapter *padapter=precvframe->u.hdr.adapter;
struct recv_priv *precvpriv = &padapter->recvpriv; struct recv_priv *precvpriv = &padapter->recvpriv;
@ -266,7 +266,7 @@ _func_exit_;
sint rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue) sint rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue)
{ {
sint ret; sint ret;
_irqL irqL; unsigned long irqL;
_enter_critical_bh(&queue->lock, &irqL); _enter_critical_bh(&queue->lock, &irqL);
ret = _rtw_enqueue_recvframe(precvframe, queue); ret = _rtw_enqueue_recvframe(precvframe, queue);
@ -335,7 +335,7 @@ u32 rtw_free_uc_swdec_pending_queue(_adapter *adapter)
sint rtw_enqueue_recvbuf_to_head(struct recv_buf *precvbuf, _queue *queue) sint rtw_enqueue_recvbuf_to_head(struct recv_buf *precvbuf, _queue *queue)
{ {
_irqL irqL; unsigned long irqL;
_enter_critical_bh(&queue->lock, &irqL); _enter_critical_bh(&queue->lock, &irqL);
@ -349,7 +349,7 @@ sint rtw_enqueue_recvbuf_to_head(struct recv_buf *precvbuf, _queue *queue)
sint rtw_enqueue_recvbuf(struct recv_buf *precvbuf, _queue *queue) sint rtw_enqueue_recvbuf(struct recv_buf *precvbuf, _queue *queue)
{ {
_irqL irqL; unsigned long irqL;
_enter_critical_ex(&queue->lock, &irqL); _enter_critical_ex(&queue->lock, &irqL);
rtw_list_delete(&precvbuf->list); rtw_list_delete(&precvbuf->list);
@ -361,7 +361,7 @@ sint rtw_enqueue_recvbuf(struct recv_buf *precvbuf, _queue *queue)
struct recv_buf *rtw_dequeue_recvbuf (_queue *queue) struct recv_buf *rtw_dequeue_recvbuf (_queue *queue)
{ {
_irqL irqL; unsigned long irqL;
struct recv_buf *precvbuf; struct recv_buf *precvbuf;
_list *plist, *phead; _list *plist, *phead;
@ -1265,7 +1265,7 @@ sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame)
if ((psta->state&WIFI_SLEEP_STATE) && (pstapriv->sta_dz_bitmap&BIT(psta->aid))) if ((psta->state&WIFI_SLEEP_STATE) && (pstapriv->sta_dz_bitmap&BIT(psta->aid)))
{ {
_irqL irqL; unsigned long irqL;
_list *xmitframe_plist, *xmitframe_phead; _list *xmitframe_plist, *xmitframe_phead;
struct xmit_frame *pxmitframe=NULL; struct xmit_frame *pxmitframe=NULL;
@ -2328,7 +2328,7 @@ static int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ct
static int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe) static int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
{ {
_irqL irql; unsigned long irql;
int retval = _SUCCESS; int retval = _SUCCESS;
struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib; struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib;
struct recv_reorder_ctrl *preorder_ctrl = prframe->u.hdr.preorder_ctrl; struct recv_reorder_ctrl *preorder_ctrl = prframe->u.hdr.preorder_ctrl;
@ -2440,7 +2440,7 @@ _err_exit:
void rtw_reordering_ctrl_timeout_handler(void *pcontext) void rtw_reordering_ctrl_timeout_handler(void *pcontext)
{ {
_irqL irql; unsigned long irql;
struct recv_reorder_ctrl *preorder_ctrl = (struct recv_reorder_ctrl *)pcontext; struct recv_reorder_ctrl *preorder_ctrl = (struct recv_reorder_ctrl *)pcontext;
_adapter *padapter = preorder_ctrl->padapter; _adapter *padapter = preorder_ctrl->padapter;
_queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue; _queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
@ -2671,7 +2671,7 @@ int recv_func(_adapter *padapter, union recv_frame *rframe)
if (check_fwstate(mlmepriv, WIFI_STATION_STATE) && psecuritypriv->busetkipkey) if (check_fwstate(mlmepriv, WIFI_STATION_STATE) && psecuritypriv->busetkipkey)
{ {
union recv_frame *pending_frame; union recv_frame *pending_frame;
_irqL irqL; unsigned long irqL;
while ((pending_frame=rtw_alloc_recvframe(&padapter->recvpriv.uc_swdec_pending_queue))) { while ((pending_frame=rtw_alloc_recvframe(&padapter->recvpriv.uc_swdec_pending_queue))) {
if (recv_func_posthandle(padapter, pending_frame) == _SUCCESS) if (recv_func_posthandle(padapter, pending_frame) == _SUCCESS)

2
core/rtw_sreset.c
View file

@ -49,7 +49,7 @@ u8 sreset_get_wifi_status(_adapter *padapter)
u8 status = WIFI_STATUS_SUCCESS; u8 status = WIFI_STATUS_SUCCESS;
u32 val32 = 0; u32 val32 = 0;
_irqL irqL; unsigned long irqL;
if (psrtpriv->silent_reset_inprogress == true) if (psrtpriv->silent_reset_inprogress == true)
{ {
return status; return status;

16
core/rtw_sta_mgt.c
View file

@ -203,7 +203,7 @@ _func_exit_;
void rtw_mfree_all_stainfo(struct sta_priv *pstapriv ); void rtw_mfree_all_stainfo(struct sta_priv *pstapriv );
void rtw_mfree_all_stainfo(struct sta_priv *pstapriv ) void rtw_mfree_all_stainfo(struct sta_priv *pstapriv )
{ {
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
@ -253,7 +253,7 @@ void rtw_mfree_sta_priv_lock(struct sta_priv *pstapriv)
u32 _rtw_free_sta_priv(struct sta_priv *pstapriv) u32 _rtw_free_sta_priv(struct sta_priv *pstapriv)
{ {
_irqL irqL; unsigned long irqL;
_list *phead, *plist; _list *phead, *plist;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
struct recv_reorder_ctrl *preorder_ctrl; struct recv_reorder_ctrl *preorder_ctrl;
@ -298,7 +298,7 @@ _func_exit_;
struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
{ {
_irqL irqL, irqL2; unsigned long irqL, irqL2;
s32 index; s32 index;
_list *phash_list; _list *phash_list;
struct sta_info *psta; struct sta_info *psta;
@ -395,7 +395,7 @@ _func_exit_;
u32 rtw_free_stainfo(_adapter *padapter , struct sta_info *psta) u32 rtw_free_stainfo(_adapter *padapter , struct sta_info *psta)
{ {
int i; int i;
_irqL irqL0; unsigned long irqL0;
_queue *pfree_sta_queue; _queue *pfree_sta_queue;
struct recv_reorder_ctrl *preorder_ctrl; struct recv_reorder_ctrl *preorder_ctrl;
struct sta_xmit_priv *pstaxmitpriv; struct sta_xmit_priv *pstaxmitpriv;
@ -472,7 +472,7 @@ _func_enter_;
/* for A-MPDU Rx reordering buffer control, cancel reordering_ctrl_timer */ /* for A-MPDU Rx reordering buffer control, cancel reordering_ctrl_timer */
for (i=0; i < 16 ; i++) for (i=0; i < 16 ; i++)
{ {
_irqL irqL; unsigned long irqL;
_list *phead, *plist; _list *phead, *plist;
union recv_frame *prframe; union recv_frame *prframe;
_queue *ppending_recvframe_queue; _queue *ppending_recvframe_queue;
@ -559,7 +559,7 @@ _func_exit_;
/* free all stainfo which in sta_hash[all] */ /* free all stainfo which in sta_hash[all] */
void rtw_free_all_stainfo(_adapter *padapter) void rtw_free_all_stainfo(_adapter *padapter)
{ {
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
s32 index; s32 index;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
@ -602,7 +602,7 @@ _func_exit_;
struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
{ {
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
@ -699,7 +699,7 @@ u8 rtw_access_ctrl(_adapter *padapter, u8 *mac_addr)
{ {
u8 res = true; u8 res = true;
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
struct rtw_wlan_acl_node *paclnode; struct rtw_wlan_acl_node *paclnode;
u8 match = false; u8 match = false;

30
core/rtw_xmit.c
View file

@ -1447,7 +1447,7 @@ void rtw_count_tx_stats(PADAPTER padapter, struct xmit_frame *pxmitframe, int sz
struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv) struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv)
{ {
_irqL irqL; unsigned long irqL;
struct xmit_buf *pxmitbuf = NULL; struct xmit_buf *pxmitbuf = NULL;
_list *plist, *phead; _list *plist, *phead;
_queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue; _queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue;
@ -1492,7 +1492,7 @@ _func_exit_;
s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
{ {
_irqL irqL; unsigned long irqL;
_queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue; _queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue;
_func_enter_; _func_enter_;
@ -1518,7 +1518,7 @@ _func_exit_;
struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv) struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv)
{ {
_irqL irqL; unsigned long irqL;
struct xmit_buf *pxmitbuf = NULL; struct xmit_buf *pxmitbuf = NULL;
_list *plist, *phead; _list *plist, *phead;
_queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue; _queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue;
@ -1560,7 +1560,7 @@ _func_exit_;
s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
{ {
_irqL irqL; unsigned long irqL;
_queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue; _queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue;
_func_enter_; _func_enter_;
@ -1619,7 +1619,7 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)/* _queue *pf
pfree_xmit_queue pfree_xmit_queue
*/ */
_irqL irqL; unsigned long irqL;
struct xmit_frame *pxframe = NULL; struct xmit_frame *pxframe = NULL;
_list *plist, *phead; _list *plist, *phead;
_queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue; _queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue;
@ -1672,7 +1672,7 @@ _func_exit_;
s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframe) s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframe)
{ {
_irqL irqL; unsigned long irqL;
_queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue; _queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue;
_adapter *padapter = pxmitpriv->adapter; _adapter *padapter = pxmitpriv->adapter;
_pkt *pndis_pkt = NULL; _pkt *pndis_pkt = NULL;
@ -1713,7 +1713,7 @@ _func_exit_;
void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, _queue *pframequeue) void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, _queue *pframequeue)
{ {
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
struct xmit_frame *pxmitframe; struct xmit_frame *pxmitframe;
@ -1781,7 +1781,7 @@ static struct xmit_frame *dequeue_one_xmitframe(struct xmit_priv *pxmitpriv, str
struct xmit_frame* rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit_i, sint entry) struct xmit_frame* rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit_i, sint entry)
{ {
_irqL irqL0; unsigned long irqL0;
_list *sta_plist, *sta_phead; _list *sta_plist, *sta_phead;
struct hw_xmit *phwxmit; struct hw_xmit *phwxmit;
struct tx_servq *ptxservq = NULL; struct tx_servq *ptxservq = NULL;
@ -1951,7 +1951,7 @@ _func_exit_;
*/ */
s32 rtw_xmit_classifier(_adapter *padapter, struct xmit_frame *pxmitframe) s32 rtw_xmit_classifier(_adapter *padapter, struct xmit_frame *pxmitframe)
{ {
/* _irqL irqL0; */ /* unsigned long irqL0; */
u8 ac_index; u8 ac_index;
struct sta_info *psta; struct sta_info *psta;
struct tx_servq *ptxservq; struct tx_servq *ptxservq;
@ -2090,7 +2090,7 @@ static int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb)
{ {
struct sk_buff *skb = *pskb; struct sk_buff *skb = *pskb;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
_irqL irqL; unsigned long irqL;
/* if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == true) */ /* if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == true) */
{ {
int res, is_vlan_tag=0, i, do_nat25=1; int res, is_vlan_tag=0, i, do_nat25=1;
@ -2292,7 +2292,7 @@ static void do_queue_select(_adapter *padapter, struct pkt_attrib *pattrib)
s32 rtw_xmit(_adapter *padapter, _pkt **ppkt) s32 rtw_xmit(_adapter *padapter, _pkt **ppkt)
{ {
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
_irqL irqL0; unsigned long irqL0;
#endif #endif
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct xmit_frame *pxmitframe = NULL; struct xmit_frame *pxmitframe = NULL;
@ -2358,7 +2358,7 @@ s32 rtw_xmit(_adapter *padapter, _pkt **ppkt)
sint xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *pxmitframe) sint xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *pxmitframe)
{ {
_irqL irqL; unsigned long irqL;
sint ret=false; sint ret=false;
struct sta_info *psta=NULL; struct sta_info *psta=NULL;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
@ -2521,7 +2521,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(_adapter *padapter, struct sta_info *psta)
{ {
_irqL irqL0; unsigned long irqL0;
struct sta_info *psta_bmc; struct sta_info *psta_bmc;
struct sta_xmit_priv *pstaxmitpriv; struct sta_xmit_priv *pstaxmitpriv;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
@ -2564,7 +2564,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(_adapter *padapter, struct sta_info *psta)
{ {
_irqL irqL; unsigned long irqL;
u8 update_mask=0, wmmps_ac=0; u8 update_mask=0, wmmps_ac=0;
struct sta_info *psta_bmc; struct sta_info *psta_bmc;
_list *xmitframe_plist, *xmitframe_phead; _list *xmitframe_plist, *xmitframe_phead;
@ -2723,7 +2723,7 @@ void wakeup_sta_to_xmit(_adapter *padapter, struct sta_info *psta)
void xmit_delivery_enabled_frames(_adapter *padapter, struct sta_info *psta) void xmit_delivery_enabled_frames(_adapter *padapter, struct sta_info *psta)
{ {
_irqL irqL; unsigned long irqL;
u8 wmmps_ac=0; u8 wmmps_ac=0;
_list *xmitframe_plist, *xmitframe_phead; _list *xmitframe_plist, *xmitframe_phead;
struct xmit_frame *pxmitframe=NULL; struct xmit_frame *pxmitframe=NULL;

4
hal/rtl8188eu_xmit.c
View file

@ -518,7 +518,7 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
struct tx_servq *ptxservq = NULL; struct tx_servq *ptxservq = NULL;
_irqL irqL; unsigned long irqL;
_list *xmitframe_plist = NULL, *xmitframe_phead = NULL; _list *xmitframe_plist = NULL, *xmitframe_phead = NULL;
u32 pbuf; /* next pkt address */ u32 pbuf; /* next pkt address */
@ -732,7 +732,7 @@ static s32 xmitframe_direct(_adapter *padapter, struct xmit_frame *pxmitframe)
*/ */
static s32 pre_xmitframe(_adapter *padapter, struct xmit_frame *pxmitframe) static s32 pre_xmitframe(_adapter *padapter, struct xmit_frame *pxmitframe)
{ {
_irqL irqL; unsigned long irqL;
s32 res; s32 res;
struct xmit_buf *pxmitbuf = NULL; struct xmit_buf *pxmitbuf = NULL;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;

6
hal/usb_ops_linux.c
View file

@ -556,7 +556,7 @@ void rtl8188eu_recv_tasklet(void *priv)
static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
{ {
_irqL irqL; unsigned long irqL;
uint isevt, *pbuf; uint isevt, *pbuf;
struct recv_buf *precvbuf = (struct recv_buf *)purb->context; struct recv_buf *precvbuf = (struct recv_buf *)purb->context;
_adapter *padapter =(_adapter *)precvbuf->adapter; _adapter *padapter =(_adapter *)precvbuf->adapter;
@ -640,13 +640,13 @@ _func_exit_;
static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem) static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem)
{ {
_irqL irqL; unsigned long irqL;
int err; int err;
unsigned int pipe; unsigned int pipe;
SIZE_PTR tmpaddr=0; SIZE_PTR tmpaddr=0;
SIZE_PTR alignment=0; SIZE_PTR alignment=0;
u32 ret = _SUCCESS; u32 ret = _SUCCESS;
PURB purb = NULL; struct urb * purb = NULL;
struct recv_buf *precvbuf = (struct recv_buf *)rmem; struct recv_buf *precvbuf = (struct recv_buf *)rmem;
_adapter *adapter = pintfhdl->padapter; _adapter *adapter = pintfhdl->padapter;
struct dvobj_priv *pdvobj = adapter_to_dvobj(adapter); struct dvobj_priv *pdvobj = adapter_to_dvobj(adapter);

2
include/osdep_intf.h
View file

@ -49,7 +49,7 @@ The protection mechanism is through the pending queue.
_mutex ioctl_mutex; _mutex ioctl_mutex;
// when in USB, IO is through interrupt in/out endpoints // when in USB, IO is through interrupt in/out endpoints
struct usb_device *udev; struct usb_device *udev;
PURB piorw_urb; struct urb * piorw_urb;
u8 io_irp_cnt; u8 io_irp_cnt;
u8 bio_irp_pending; u8 bio_irp_pending;
_sema io_retevt; _sema io_retevt;

19
include/osdep_service.h
View file

@ -69,7 +69,6 @@
#include <linux/usb/ch9.h> #include <linux/usb/ch9.h>
#endif #endif
typedef struct urb * PURB;
typedef struct semaphore _sema; typedef struct semaphore _sema;
typedef spinlock_t _lock; typedef spinlock_t _lock;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
@ -90,8 +89,6 @@
typedef struct __queue _queue; typedef struct __queue _queue;
typedef struct list_head _list; typedef struct list_head _list;
typedef int _OS_STATUS; typedef int _OS_STATUS;
//typedef u32 _irqL;
typedef unsigned long _irqL;
typedef struct net_device * _nic_hdl; typedef struct net_device * _nic_hdl;
typedef void* _thread_hdl_; typedef void* _thread_hdl_;
@ -146,37 +143,37 @@ __inline static _list *get_list_head(_queue *queue)
((type *)((char *)(ptr)-(SIZE_T)(&((type *)0)->member))) ((type *)((char *)(ptr)-(SIZE_T)(&((type *)0)->member)))
__inline static void _enter_critical(_lock *plock, _irqL *pirqL) __inline static void _enter_critical(_lock *plock, unsigned long *pirqL)
{ {
spin_lock_irqsave(plock, *pirqL); spin_lock_irqsave(plock, *pirqL);
} }
__inline static void _exit_critical(_lock *plock, _irqL *pirqL) __inline static void _exit_critical(_lock *plock, unsigned long *pirqL)
{ {
spin_unlock_irqrestore(plock, *pirqL); spin_unlock_irqrestore(plock, *pirqL);
} }
__inline static void _enter_critical_ex(_lock *plock, _irqL *pirqL) __inline static void _enter_critical_ex(_lock *plock, unsigned long *pirqL)
{ {
spin_lock_irqsave(plock, *pirqL); spin_lock_irqsave(plock, *pirqL);
} }
__inline static void _exit_critical_ex(_lock *plock, _irqL *pirqL) __inline static void _exit_critical_ex(_lock *plock, unsigned long *pirqL)
{ {
spin_unlock_irqrestore(plock, *pirqL); spin_unlock_irqrestore(plock, *pirqL);
} }
__inline static void _enter_critical_bh(_lock *plock, _irqL *pirqL) __inline static void _enter_critical_bh(_lock *plock, unsigned long *pirqL)
{ {
spin_lock_bh(plock); spin_lock_bh(plock);
} }
__inline static void _exit_critical_bh(_lock *plock, _irqL *pirqL) __inline static void _exit_critical_bh(_lock *plock, unsigned long *pirqL)
{ {
spin_unlock_bh(plock); spin_unlock_bh(plock);
} }
__inline static int _enter_critical_mutex(_mutex *pmutex, _irqL *pirqL) __inline static int _enter_critical_mutex(_mutex *pmutex, unsigned long *pirqL)
{ {
int ret = 0; int ret = 0;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
@ -188,7 +185,7 @@ __inline static int _enter_critical_mutex(_mutex *pmutex, _irqL *pirqL)
} }
__inline static void _exit_critical_mutex(_mutex *pmutex, _irqL *pirqL) __inline static void _exit_critical_mutex(_mutex *pmutex, unsigned long *pirqL)
{ {
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
mutex_unlock(pmutex); mutex_unlock(pmutex);

10
include/rtw_mlme.h
View file

@ -502,7 +502,7 @@ __inline static void _clr_fwstate_(struct mlme_priv *pmlmepriv, sint state)
*/ */
__inline static void clr_fwstate(struct mlme_priv *pmlmepriv, sint state) __inline static void clr_fwstate(struct mlme_priv *pmlmepriv, sint state)
{ {
_irqL irqL; unsigned long irqL;
_enter_critical_bh(&pmlmepriv->lock, &irqL); _enter_critical_bh(&pmlmepriv->lock, &irqL);
if (check_fwstate(pmlmepriv, state) == true) if (check_fwstate(pmlmepriv, state) == true)
@ -512,7 +512,7 @@ __inline static void clr_fwstate(struct mlme_priv *pmlmepriv, sint state)
__inline static void clr_fwstate_ex(struct mlme_priv *pmlmepriv, sint state) __inline static void clr_fwstate_ex(struct mlme_priv *pmlmepriv, sint state)
{ {
_irqL irqL; unsigned long irqL;
_enter_critical_bh(&pmlmepriv->lock, &irqL); _enter_critical_bh(&pmlmepriv->lock, &irqL);
_clr_fwstate_(pmlmepriv, state); _clr_fwstate_(pmlmepriv, state);
@ -521,7 +521,7 @@ __inline static void clr_fwstate_ex(struct mlme_priv *pmlmepriv, sint state)
__inline static void up_scanned_network(struct mlme_priv *pmlmepriv) __inline static void up_scanned_network(struct mlme_priv *pmlmepriv)
{ {
_irqL irqL; unsigned long irqL;
_enter_critical_bh(&pmlmepriv->lock, &irqL); _enter_critical_bh(&pmlmepriv->lock, &irqL);
pmlmepriv->num_of_scanned++; pmlmepriv->num_of_scanned++;
@ -530,7 +530,7 @@ __inline static void up_scanned_network(struct mlme_priv *pmlmepriv)
__inline static void down_scanned_network(struct mlme_priv *pmlmepriv) __inline static void down_scanned_network(struct mlme_priv *pmlmepriv)
{ {
_irqL irqL; unsigned long irqL;
_enter_critical_bh(&pmlmepriv->lock, &irqL); _enter_critical_bh(&pmlmepriv->lock, &irqL);
pmlmepriv->num_of_scanned--; pmlmepriv->num_of_scanned--;
@ -539,7 +539,7 @@ __inline static void down_scanned_network(struct mlme_priv *pmlmepriv)
__inline static void set_scanned_network_val(struct mlme_priv *pmlmepriv, sint val) __inline static void set_scanned_network_val(struct mlme_priv *pmlmepriv, sint val)
{ {
_irqL irqL; unsigned long irqL;
_enter_critical_bh(&pmlmepriv->lock, &irqL); _enter_critical_bh(&pmlmepriv->lock, &irqL);
pmlmepriv->num_of_scanned = val; pmlmepriv->num_of_scanned = val;

2
include/rtw_mp.h
View file

@ -118,7 +118,7 @@ struct mp_xmit_frame
//insert urb, irp, and irpcnt info below... //insert urb, irp, and irpcnt info below...
u8 *mem_addr; u8 *mem_addr;
u32 sz[8]; u32 sz[8];
PURB pxmit_urb[8]; struct urb * pxmit_urb[8];
u8 bpending[8]; u8 bpending[8];
sint ac_tag[8]; sint ac_tag[8];
sint last[8]; sint last[8];

2
include/rtw_recv.h
View file

@ -277,7 +277,7 @@ struct recv_buf
u8 *pdata; u8 *pdata;
u8 *ptail; u8 *ptail;
u8 *pend; u8 *pend;
PURB purb; struct urb * purb;
dma_addr_t dma_transfer_addr; /* (in) dma addr for transfer_buffer */ dma_addr_t dma_transfer_addr; /* (in) dma addr for transfer_buffer */
u32 alloc_sz; u32 alloc_sz;

2
include/rtw_xmit.h
View file

@ -223,7 +223,7 @@ struct xmit_buf
u32 len; u32 len;
struct submit_ctx *sctx; struct submit_ctx *sctx;
u32 ff_hwaddr; u32 ff_hwaddr;
PURB pxmit_urb[8]; struct urb *pxmit_urb[8];
dma_addr_t dma_transfer_addr; /* (in) dma addr for transfer_buffer */ dma_addr_t dma_transfer_addr; /* (in) dma addr for transfer_buffer */
u8 bpending[8]; u8 bpending[8];
sint last[8]; sint last[8];

36
os_dep/ioctl_linux.c
View file

@ -1403,7 +1403,7 @@ static int rtw_wx_set_wap(struct net_device *dev,
union iwreq_data *awrq, union iwreq_data *awrq,
char *extra) char *extra)
{ {
_irqL irqL; unsigned long irqL;
uint ret = 0; uint ret = 0;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev); _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct sockaddr *temp = (struct sockaddr *)awrq; struct sockaddr *temp = (struct sockaddr *)awrq;
@ -1556,7 +1556,7 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev); _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv= &padapter->mlmepriv; struct mlme_priv *pmlmepriv= &padapter->mlmepriv;
struct ndis_802_11_ssid ssid[RTW_SSID_SCAN_AMOUNT]; struct ndis_802_11_ssid ssid[RTW_SSID_SCAN_AMOUNT];
_irqL irqL; unsigned long irqL;
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
struct wifidirect_info *pwdinfo= &(padapter->wdinfo); struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
#endif //CONFIG_P2P #endif //CONFIG_P2P
@ -1756,7 +1756,7 @@ _func_exit_;
static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a, static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev); _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -1855,7 +1855,7 @@ static int rtw_wx_set_essid(struct net_device *dev,
struct iw_request_info *a, struct iw_request_info *a,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
_irqL irqL; unsigned long irqL;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev); _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_queue *queue = &pmlmepriv->scanned_queue; _queue *queue = &pmlmepriv->scanned_queue;
@ -3119,7 +3119,7 @@ static int rtw_get_ap_info(struct net_device *dev,
{ {
int bssid_match, ret = 0; int bssid_match, ret = 0;
u32 cnt=0, wpa_ielen; u32 cnt=0, wpa_ielen;
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
unsigned char *pbuf; unsigned char *pbuf;
u8 bssid[ETH_ALEN]; u8 bssid[ETH_ALEN];
@ -3767,7 +3767,7 @@ static int rtw_p2p_get_wps_configmethod(struct net_device *dev,
int jj,kk; int jj,kk;
u8 peerMACStr[ 17 ] = { 0x00 }; u8 peerMACStr[ 17 ] = { 0x00 };
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
_queue *queue = &(pmlmepriv->scanned_queue); _queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
@ -3847,7 +3847,7 @@ static int rtw_p2p_get_go_device_address(struct net_device *dev,
int jj,kk; int jj,kk;
u8 peerMACStr[ 17 ] = { 0x00 }; u8 peerMACStr[ 17 ] = { 0x00 };
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
_queue *queue = &(pmlmepriv->scanned_queue); _queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
@ -3955,7 +3955,7 @@ static int rtw_p2p_get_device_type(struct net_device *dev,
int jj,kk; int jj,kk;
u8 peerMACStr[ 17 ] = { 0x00 }; u8 peerMACStr[ 17 ] = { 0x00 };
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
_queue *queue = &(pmlmepriv->scanned_queue); _queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
@ -4046,7 +4046,7 @@ static int rtw_p2p_get_device_name(struct net_device *dev,
int jj,kk; int jj,kk;
u8 peerMACStr[ 17 ] = { 0x00 }; u8 peerMACStr[ 17 ] = { 0x00 };
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
_queue *queue = &(pmlmepriv->scanned_queue); _queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
@ -4132,7 +4132,7 @@ static int rtw_p2p_get_invitation_procedure(struct net_device *dev,
int jj,kk; int jj,kk;
u8 peerMACStr[ 17 ] = { 0x00 }; u8 peerMACStr[ 17 ] = { 0x00 };
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
_queue *queue = &(pmlmepriv->scanned_queue); _queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
@ -4233,7 +4233,7 @@ static int rtw_p2p_connect(struct net_device *dev,
int jj,kk; int jj,kk;
u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 }; u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 };
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
_queue *queue = &(pmlmepriv->scanned_queue); _queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
@ -4338,7 +4338,7 @@ static int rtw_p2p_invite_req(struct net_device *dev,
u8 attr_content[50] = { 0x00 }, _status = 0; u8 attr_content[50] = { 0x00 }, _status = 0;
u8 *p2pie; u8 *p2pie;
uint p2pielen = 0, attr_contentlen = 0; uint p2pielen = 0, attr_contentlen = 0;
_irqL irqL; unsigned long irqL;
struct tx_invite_req_info* pinvite_req_info = &pwdinfo->invitereq_info; struct tx_invite_req_info* pinvite_req_info = &pwdinfo->invitereq_info;
// The input data contains two informations. // The input data contains two informations.
@ -4477,7 +4477,7 @@ static int rtw_p2p_set_persistent(struct net_device *dev,
u8 attr_content[50] = { 0x00 }, _status = 0; u8 attr_content[50] = { 0x00 }, _status = 0;
u8 *p2pie; u8 *p2pie;
uint p2pielen = 0, attr_contentlen = 0; uint p2pielen = 0, attr_contentlen = 0;
_irqL irqL; unsigned long irqL;
struct tx_invite_req_info* pinvite_req_info = &pwdinfo->invitereq_info; struct tx_invite_req_info* pinvite_req_info = &pwdinfo->invitereq_info;
// The input data is 0 or 1 // The input data is 0 or 1
@ -4532,7 +4532,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
u8 attr_content[100] = { 0x00 }, _status = 0; u8 attr_content[100] = { 0x00 }, _status = 0;
u8 *p2pie; u8 *p2pie;
uint p2pielen = 0, attr_contentlen = 0; uint p2pielen = 0, attr_contentlen = 0;
_irqL irqL; unsigned long irqL;
// The input data contains two informations. // The input data contains two informations.
// 1. First information is the MAC address which wants to issue the provisioning discovery request frame. // 1. First information is the MAC address which wants to issue the provisioning discovery request frame.
@ -5052,7 +5052,7 @@ static int rtw_dbg_port(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
_irqL irqL; unsigned long irqL;
int ret = 0; int ret = 0;
u8 major_cmd, minor_cmd; u8 major_cmd, minor_cmd;
u16 arg; u16 arg;
@ -6345,7 +6345,7 @@ static int rtw_set_beacon(struct net_device *dev, struct ieee_param *param, int
static int rtw_hostapd_sta_flush(struct net_device *dev) static int rtw_hostapd_sta_flush(struct net_device *dev)
{ {
//_irqL irqL; //unsigned long irqL;
//_list *phead, *plist; //_list *phead, *plist;
int ret=0; int ret=0;
//struct sta_info *psta = NULL; //struct sta_info *psta = NULL;
@ -6364,7 +6364,7 @@ static int rtw_hostapd_sta_flush(struct net_device *dev)
static int rtw_add_sta(struct net_device *dev, struct ieee_param *param) static int rtw_add_sta(struct net_device *dev, struct ieee_param *param)
{ {
_irqL irqL; unsigned long irqL;
int ret=0; int ret=0;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev); _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
@ -6453,7 +6453,7 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param)
static int rtw_del_sta(struct net_device *dev, struct ieee_param *param) static int rtw_del_sta(struct net_device *dev, struct ieee_param *param)
{ {
_irqL irqL; unsigned long irqL;
int ret=0; int ret=0;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev); _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);

8
os_dep/usb_ops_linux.c
View file

@ -79,7 +79,7 @@ static u32 usb_bulkout_zero(struct intf_hdl *pintfhdl, u32 addr)
u32 ret; u32 ret;
unsigned char *pbuf; unsigned char *pbuf;
struct zero_bulkout_context *pcontext; struct zero_bulkout_context *pcontext;
PURB purb = NULL; struct urb * purb = NULL;
_adapter *padapter = (_adapter *)pintfhdl->padapter; _adapter *padapter = (_adapter *)pintfhdl->padapter;
struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter); struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter);
struct usb_device *pusbd = pdvobj->pusbdev; struct usb_device *pusbd = pdvobj->pusbdev;
@ -155,7 +155,7 @@ void usb_read_port_cancel(struct intf_hdl *pintfhdl)
static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs) static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs)
{ {
_irqL irqL; unsigned long irqL;
int i; int i;
struct xmit_buf *pxmitbuf = (struct xmit_buf *)purb->context; struct xmit_buf *pxmitbuf = (struct xmit_buf *)purb->context;
_adapter *padapter = pxmitbuf->padapter; _adapter *padapter = pxmitbuf->padapter;
@ -251,11 +251,11 @@ _func_exit_;
u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem) u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
{ {
_irqL irqL; unsigned long irqL;
unsigned int pipe; unsigned int pipe;
int status; int status;
u32 ret = _FAIL, bwritezero = false; u32 ret = _FAIL, bwritezero = false;
PURB purb = NULL; struct urb * purb = NULL;
_adapter *padapter = (_adapter *)pintfhdl->padapter; _adapter *padapter = (_adapter *)pintfhdl->padapter;
struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter); struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;

4
os_dep/xmit_linux.c
View file

@ -177,7 +177,7 @@ void rtw_os_xmit_schedule(_adapter *padapter)
{ {
_adapter *pri_adapter = padapter; _adapter *pri_adapter = padapter;
_irqL irqL; unsigned long irqL;
struct xmit_priv *pxmitpriv; struct xmit_priv *pxmitpriv;
if (!padapter) if (!padapter)
@ -225,7 +225,7 @@ static int rtw_mlcst2unicst(_adapter *padapter, struct sk_buff *skb)
{ {
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
_irqL irqL; unsigned long irqL;
_list *phead, *plist; _list *phead, *plist;
struct sk_buff *newskb; struct sk_buff *newskb;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;