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

rtl8188eu: Replace typedef for _irqL with 'unsigned long'

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2018-12-17 10:51:01 -06:00
parent 32e894d44f
commit b89e0320f5
30 changed files with 264 additions and 266 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
core/rtw_ap.c
View file

@ -286,7 +286,7 @@ 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 = _FALSE; u8 updated = _FALSE;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
@ -654,7 +654,7 @@ void add_RATid(_adapter *padapter, struct sta_info *psta, u8 rssi_level, u8 is_u
void update_bmc_sta(_adapter *padapter) void update_bmc_sta(_adapter *padapter)
{ {
_irqL irqL; unsigned long irqL;
unsigned char network_type; unsigned char network_type;
int supportRateNum = 0; int supportRateNum = 0;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -705,7 +705,7 @@ void update_bmc_sta(_adapter *padapter)
* AID: 1~MAX for sta and 0 for bc/mc in ap/adhoc mode */ * AID: 1~MAX for sta and 0 for bc/mc in ap/adhoc mode */
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);
@ -1053,7 +1053,7 @@ static void update_hw_ht_param(_adapter *padapter)
static void rtw_ap_check_scan(_adapter *padapter) static void rtw_ap_check_scan(_adapter *padapter)
{ {
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
u32 delta_time, lifetime; u32 delta_time, lifetime;
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
@ -1320,7 +1320,7 @@ update_beacon:
/* update beacon content only if bstart_bss is _TRUE */ /* update beacon content only if bstart_bss is _TRUE */
if (_TRUE == pmlmeext->bstart_bss) { if (_TRUE == pmlmeext->bstart_bss) {
_irqL irqL; unsigned long irqL;
if ((ATOMIC_READ(&pmlmepriv->olbc) == _TRUE) || (ATOMIC_READ(&pmlmepriv->olbc_ht) == _TRUE)) { if ((ATOMIC_READ(&pmlmepriv->olbc) == _TRUE) || (ATOMIC_READ(&pmlmepriv->olbc_ht) == _TRUE)) {
/* AP is not starting a 40 MHz BSS in presence of an 802.11g BSS. */ /* AP is not starting a 40 MHz BSS in presence of an 802.11g BSS. */
@ -1786,7 +1786,7 @@ static void rtw_macaddr_acl_init(_adapter *adapter)
struct wlan_acl_pool *acl = &stapriv->acl_list; struct wlan_acl_pool *acl = &stapriv->acl_list;
_queue *acl_node_q = &acl->acl_node_q; _queue *acl_node_q = &acl->acl_node_q;
int i; int i;
_irqL irqL; unsigned long irqL;
_enter_critical_bh(&(acl_node_q->lock), &irqL); _enter_critical_bh(&(acl_node_q->lock), &irqL);
_rtw_init_listhead(&(acl_node_q->queue)); _rtw_init_listhead(&(acl_node_q->queue));
@ -1804,7 +1804,7 @@ static void rtw_macaddr_acl_deinit(_adapter *adapter)
struct sta_priv *stapriv = &adapter->stapriv; struct sta_priv *stapriv = &adapter->stapriv;
struct wlan_acl_pool *acl = &stapriv->acl_list; struct wlan_acl_pool *acl = &stapriv->acl_list;
_queue *acl_node_q = &acl->acl_node_q; _queue *acl_node_q = &acl->acl_node_q;
_irqL irqL; unsigned long irqL;
_list *head, *list; _list *head, *list;
struct rtw_wlan_acl_node *acl_node; struct rtw_wlan_acl_node *acl_node;
@ -1842,7 +1842,7 @@ void rtw_set_macaddr_acl(_adapter *adapter, int mode)
int rtw_acl_add_sta(_adapter *adapter, const u8 *addr) int rtw_acl_add_sta(_adapter *adapter, const u8 *addr)
{ {
_irqL irqL; unsigned long irqL;
_list *list, *head; _list *list, *head;
u8 existed = 0; u8 existed = 0;
int i = -1, ret = 0; int i = -1, ret = 0;
@ -1906,7 +1906,7 @@ release_lock:
int rtw_acl_remove_sta(_adapter *adapter, const u8 *addr) int rtw_acl_remove_sta(_adapter *adapter, const u8 *addr)
{ {
_irqL irqL; unsigned long irqL;
_list *list, *head; _list *list, *head;
int ret = 0; int ret = 0;
struct rtw_wlan_acl_node *acl_node; struct rtw_wlan_acl_node *acl_node;
@ -2078,7 +2078,7 @@ int rtw_ap_set_wep_key(_adapter *padapter, u8 *key, u8 keylen, int keyid, u8 set
static u8 rtw_ap_bmc_frames_hdl(_adapter *padapter) static u8 rtw_ap_bmc_frames_hdl(_adapter *padapter)
{ {
#define HIQ_XMIT_COUNTS (6) #define HIQ_XMIT_COUNTS (6)
_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;
@ -2467,7 +2467,7 @@ static void update_bcn_vendor_spec_ie(_adapter *padapter, u8 *oui)
void _update_beacon(_adapter *padapter, u8 ie_id, u8 *oui, u8 tx, const char *tag) void _update_beacon(_adapter *padapter, u8 ie_id, u8 *oui, u8 tx, const char *tag)
{ {
_irqL irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv; struct mlme_priv *pmlmepriv;
struct mlme_ext_priv *pmlmeext; struct mlme_ext_priv *pmlmeext;
/* struct mlme_ext_info *pmlmeinfo; */ /* struct mlme_ext_info *pmlmeinfo; */
@ -2731,7 +2731,7 @@ void associated_clients_update(_adapter *padapter, u8 updated, u32 sta_info_type
{ {
/* 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;
@ -2967,7 +2967,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, bool enqueue) u8 ap_free_sta(_adapter *padapter, struct sta_info *psta, bool active, u16 reason, bool enqueue)
{ {
_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);
@ -3031,7 +3031,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;
@ -3067,7 +3067,7 @@ int rtw_ap_inform_ch_switch(_adapter *padapter, u8 new_ch, u8 ch_offset)
int rtw_sta_flush(_adapter *padapter, bool enqueue) int rtw_sta_flush(_adapter *padapter, bool enqueue)
{ {
_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;
@ -3164,7 +3164,7 @@ void rtw_ap_restore_network(_adapter *padapter)
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct sta_info *psta; struct sta_info *psta;
struct security_priv *psecuritypriv = &(padapter->securitypriv); struct security_priv *psecuritypriv = &(padapter->securitypriv);
_irqL irqL; unsigned long irqL;
_list *phead, *plist; _list *phead, *plist;
u8 chk_alive_num = 0; u8 chk_alive_num = 0;
char chk_alive_list[NUM_STA]; char chk_alive_list[NUM_STA];
@ -3285,7 +3285,7 @@ void start_ap_mode(_adapter *padapter)
void stop_ap_mode(_adapter *padapter) void stop_ap_mode(_adapter *padapter)
{ {
_irqL irqL; unsigned long irqL;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
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;
@ -3673,7 +3673,7 @@ exit:
void tx_beacon_handler(struct dvobj_priv *pdvobj) void tx_beacon_handler(struct dvobj_priv *pdvobj)
{ {
#define BEACON_EARLY_TIME 20 /* unit:TU*/ #define BEACON_EARLY_TIME 20 /* unit:TU*/
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
u32 timestamp[2]; u32 timestamp[2];
u32 bcn_interval_us; /* unit : usec */ u32 bcn_interval_us; /* unit : usec */

18
core/rtw_br_ext.c
View file

@ -370,7 +370,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];
@ -386,7 +386,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;
@ -403,7 +403,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)];
@ -478,7 +478,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);
@ -513,7 +513,7 @@ static void __nat25_db_network_insert(_adapter *priv,
static void __nat25_db_print(_adapter *priv) static void __nat25_db_print(_adapter *priv)
{ {
_irqL irqL; unsigned long irqL;
_enter_critical_bh(&priv->br_ext_lock, &irqL); _enter_critical_bh(&priv->br_ext_lock, &irqL);
#ifdef BR_EXT_DEBUG #ifdef BR_EXT_DEBUG
@ -601,7 +601,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++) {
@ -630,7 +630,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) */
@ -1408,7 +1408,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
@ -1523,7 +1523,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);

24
core/rtw_cmd.c
View file

@ -254,7 +254,7 @@ extern u8 dump_cmd_id;
sint _rtw_enqueue_cmd(_queue *queue, struct cmd_obj *obj, bool to_head) sint _rtw_enqueue_cmd(_queue *queue, struct cmd_obj *obj, bool to_head)
{ {
_irqL irqL; unsigned long irqL;
if (obj == NULL) if (obj == NULL)
@ -315,7 +315,7 @@ 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;
@ -544,7 +544,7 @@ thread_return rtw_cmd_thread(thread_context context)
PADAPTER padapter = (PADAPTER)context; PADAPTER padapter = (PADAPTER)context;
struct cmd_priv *pcmdpriv = &(padapter->cmdpriv); struct cmd_priv *pcmdpriv = &(padapter->cmdpriv);
struct drvextra_cmd_parm *extra_parm = NULL; struct drvextra_cmd_parm *extra_parm = NULL;
_irqL irqL; unsigned long irqL;
thread_enter("RTW_CMD_THREAD"); thread_enter("RTW_CMD_THREAD");
@ -743,7 +743,7 @@ post_process:
#ifdef CONFIG_EVENT_THREAD_MODE #ifdef CONFIG_EVENT_THREAD_MODE
u32 rtw_enqueue_evt(struct evt_priv *pevtpriv, struct evt_obj *obj) u32 rtw_enqueue_evt(struct evt_priv *pevtpriv, struct evt_obj *obj)
{ {
_irqL irqL; unsigned long irqL;
int res; int res;
_queue *queue = &pevtpriv->evt_queue; _queue *queue = &pevtpriv->evt_queue;
@ -771,7 +771,7 @@ exit:
struct evt_obj *rtw_dequeue_evt(_queue *queue) struct evt_obj *rtw_dequeue_evt(_queue *queue)
{ {
_irqL irqL; unsigned long irqL;
struct evt_obj *pevtobj; struct evt_obj *pevtobj;
@ -4177,7 +4177,7 @@ static void session_tracker_chk_for_sta(_adapter *adapter, struct sta_info *sta)
{ {
struct st_ctl_t *st_ctl = &sta->st_ctl; struct st_ctl_t *st_ctl = &sta->st_ctl;
int i; int i;
_irqL irqL; unsigned long irqL;
_list *plist, *phead, *pnext; _list *plist, *phead, *pnext;
_list dlist; _list dlist;
struct session_tracker *st = NULL; struct session_tracker *st = NULL;
@ -4256,7 +4256,7 @@ static void session_tracker_chk_for_adapter(_adapter *adapter)
struct sta_priv *stapriv = &adapter->stapriv; struct sta_priv *stapriv = &adapter->stapriv;
struct sta_info *sta; struct sta_info *sta;
int i; int i;
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
u8 op_wfd_mode = MIRACAST_DISABLED; u8 op_wfd_mode = MIRACAST_DISABLED;
@ -4303,7 +4303,7 @@ static void session_tracker_cmd_hdl(_adapter *adapter, struct st_cmd_parm *parm)
u32 remote_naddr = parm->remote_naddr; u32 remote_naddr = parm->remote_naddr;
u16 remote_port = parm->remote_port; u16 remote_port = parm->remote_port;
struct session_tracker *st = NULL; struct session_tracker *st = NULL;
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
u8 free_st = 0; u8 free_st = 0;
u8 alloc_st = 0; u8 alloc_st = 0;
@ -4536,7 +4536,7 @@ void rtw_survey_cmd_callback(_adapter *padapter , struct cmd_obj *pcmd)
} }
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;
@ -4585,7 +4585,7 @@ void rtw_joinbss_cmd_callback(_adapter *padapter, struct cmd_obj *pcmd)
void rtw_create_ibss_post_hdl(_adapter *padapter, int status) void rtw_create_ibss_post_hdl(_adapter *padapter, int status)
{ {
_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;
@ -4601,7 +4601,7 @@ void rtw_create_ibss_post_hdl(_adapter *padapter, int status)
_enter_critical_bh(&pmlmepriv->lock, &irqL); _enter_critical_bh(&pmlmepriv->lock, &irqL);
{ {
_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);
@ -4657,7 +4657,7 @@ 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);

20
core/rtw_debug.c
View file

@ -669,7 +669,7 @@ ssize_t proc_set_read_reg(struct file *file, const char __user *buffer, size_t c
int proc_get_rx_stat(struct seq_file *m, void *v) int proc_get_rx_stat(struct seq_file *m, void *v)
{ {
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
struct net_device *dev = m->private; struct net_device *dev = m->private;
_adapter *adapter = (_adapter *)rtw_netdev_priv(dev); _adapter *adapter = (_adapter *)rtw_netdev_priv(dev);
@ -717,7 +717,7 @@ int proc_get_rx_stat(struct seq_file *m, void *v)
int proc_get_tx_stat(struct seq_file *m, void *v) int proc_get_tx_stat(struct seq_file *m, void *v)
{ {
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
struct net_device *dev = m->private; struct net_device *dev = m->private;
_adapter *adapter = (_adapter *)rtw_netdev_priv(dev); _adapter *adapter = (_adapter *)rtw_netdev_priv(dev);
@ -1229,7 +1229,7 @@ ssize_t proc_set_backop_flags_ap(struct file *file, const char __user *buffer, s
int proc_get_survey_info(struct seq_file *m, void *v) int proc_get_survey_info(struct seq_file *m, void *v)
{ {
_irqL irqL; unsigned long irqL;
struct net_device *dev = m->private; struct net_device *dev = m->private;
_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);
@ -1307,7 +1307,7 @@ exit:
ssize_t proc_set_survey_info(struct file *file, const char __user *buffer, size_t count, loff_t *pos, void *data) ssize_t proc_set_survey_info(struct file *file, const char __user *buffer, size_t count, loff_t *pos, void *data)
{ {
_irqL irqL; unsigned long irqL;
struct net_device *dev = data; struct net_device *dev = data;
_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);
@ -2982,7 +2982,7 @@ ssize_t proc_set_txbf_cap(struct file *file, const char __user *buffer, size_t c
int proc_get_all_sta_info(struct seq_file *m, void *v) int proc_get_all_sta_info(struct seq_file *m, void *v)
{ {
struct net_device *dev = m->private; struct net_device *dev = m->private;
_irqL irqL; unsigned long irqL;
struct sta_info *psta; struct sta_info *psta;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev); _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
@ -3807,7 +3807,7 @@ static int proc_tdls_display_tdls_sta_info(struct seq_file *m)
struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; struct tdls_info *ptdlsinfo = &padapter->tdlsinfo;
struct sta_info *psta; struct sta_info *psta;
int i = 0, j = 0; int i = 0, j = 0;
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
u8 SpaceBtwnItemAndValue = TDLS_DBG_INFO_SPACE_BTWN_ITEM_AND_VALUE; u8 SpaceBtwnItemAndValue = TDLS_DBG_INFO_SPACE_BTWN_ITEM_AND_VALUE;
u8 SpaceBtwnItemAndValueTmp = 0; u8 SpaceBtwnItemAndValueTmp = 0;
@ -3979,7 +3979,7 @@ int proc_get_tdls_info(struct seq_file *m, void *v)
struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; struct tdls_info *ptdlsinfo = &padapter->tdlsinfo;
struct sta_info *psta; struct sta_info *psta;
int i = 0, j = 0; int i = 0, j = 0;
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
u8 SpaceBtwnItemAndValue = 41; u8 SpaceBtwnItemAndValue = 41;
u8 SpaceBtwnItemAndValueTmp = 0; u8 SpaceBtwnItemAndValueTmp = 0;
@ -4131,7 +4131,7 @@ ssize_t proc_set_tx_sa_query(struct file *file, const char __user *buffer, size_
struct macid_ctl_t *macid_ctl = dvobj_to_macidctl(dvobj); struct macid_ctl_t *macid_ctl = dvobj_to_macidctl(dvobj);
struct sta_info *psta; struct sta_info *psta;
_list *plist, *phead; _list *plist, *phead;
_irqL irqL; unsigned long irqL;
char tmp[16]; char tmp[16];
u8 mac_addr[NUM_STA][ETH_ALEN]; u8 mac_addr[NUM_STA][ETH_ALEN];
u32 key_type; u32 key_type;
@ -4210,7 +4210,7 @@ ssize_t proc_set_tx_deauth(struct file *file, const char __user *buffer, size_t
struct macid_ctl_t *macid_ctl = dvobj_to_macidctl(dvobj); struct macid_ctl_t *macid_ctl = dvobj_to_macidctl(dvobj);
struct sta_info *psta; struct sta_info *psta;
_list *plist, *phead; _list *plist, *phead;
_irqL irqL; unsigned long irqL;
char tmp[16]; char tmp[16];
u8 mac_addr[NUM_STA][ETH_ALEN]; u8 mac_addr[NUM_STA][ETH_ALEN];
u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
@ -4315,7 +4315,7 @@ ssize_t proc_set_tx_auth(struct file *file, const char __user *buffer, size_t co
struct macid_ctl_t *macid_ctl = dvobj_to_macidctl(dvobj); struct macid_ctl_t *macid_ctl = dvobj_to_macidctl(dvobj);
struct sta_info *psta; struct sta_info *psta;
_list *plist, *phead; _list *plist, *phead;
_irqL irqL; unsigned long irqL;
char tmp[16]; char tmp[16];
u8 mac_addr[NUM_STA][ETH_ALEN]; u8 mac_addr[NUM_STA][ETH_ALEN];
u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};

14
core/rtw_ioctl_set.c
View file

@ -71,7 +71,7 @@ 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);
@ -175,7 +175,7 @@ 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;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -242,7 +242,7 @@ exit:
u8 rtw_set_802_11_ssid(_adapter *padapter, NDIS_802_11_SSID *ssid) u8 rtw_set_802_11_ssid(_adapter *padapter, NDIS_802_11_SSID *ssid)
{ {
_irqL irqL; unsigned long irqL;
u8 status = _SUCCESS; u8 status = _SUCCESS;
u32 cur_time = 0; u32 cur_time = 0;
@ -338,7 +338,7 @@ exit:
u8 rtw_set_802_11_connect(_adapter *padapter, u8 *bssid, NDIS_802_11_SSID *ssid) u8 rtw_set_802_11_connect(_adapter *padapter, u8 *bssid, NDIS_802_11_SSID *ssid)
{ {
_irqL irqL; unsigned long irqL;
u8 status = _SUCCESS; u8 status = _SUCCESS;
u32 cur_time = 0; u32 cur_time = 0;
bool bssid_valid = _TRUE; bool bssid_valid = _TRUE;
@ -406,7 +406,7 @@ exit:
u8 rtw_set_802_11_infrastructure_mode(_adapter *padapter, u8 rtw_set_802_11_infrastructure_mode(_adapter *padapter,
NDIS_802_11_NETWORK_INFRASTRUCTURE networktype) NDIS_802_11_NETWORK_INFRASTRUCTURE 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;
NDIS_802_11_NETWORK_INFRASTRUCTURE *pold_state = &(cur_network->network.InfrastructureMode); NDIS_802_11_NETWORK_INFRASTRUCTURE *pold_state = &(cur_network->network.InfrastructureMode);
@ -482,7 +482,7 @@ u8 rtw_set_802_11_infrastructure_mode(_adapter *padapter,
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;
_enter_critical_bh(&pmlmepriv->lock, &irqL); _enter_critical_bh(&pmlmepriv->lock, &irqL);
@ -504,7 +504,7 @@ u8 rtw_set_802_11_disassociate(_adapter *padapter)
u8 rtw_set_802_11_bssid_list_scan(_adapter *padapter, NDIS_802_11_SSID *pssid, int ssid_max_num, struct rtw_ieee80211_channel *ch, int ch_num) u8 rtw_set_802_11_bssid_list_scan(_adapter *padapter, NDIS_802_11_SSID *pssid, int ssid_max_num, struct rtw_ieee80211_channel *ch, int ch_num)
{ {
_irqL irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
u8 res = _TRUE; u8 res = _TRUE;

48
core/rtw_mlme.c
View file

@ -285,7 +285,7 @@ exit:
static sint _rtw_enqueue_network(_queue *queue, struct wlan_network *pnetwork) static sint _rtw_enqueue_network(_queue *queue, struct wlan_network *pnetwork)
{ {
_irqL irqL; unsigned long irqL;
if (pnetwork == NULL) if (pnetwork == NULL)
@ -306,7 +306,7 @@ 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;
@ -333,7 +333,7 @@ struct wlan_network *_rtw_dequeue_network(_queue *queue)
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;
@ -370,7 +370,7 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv , struct wlan_network *pnetwo
{ {
u32 delta_time; u32 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);
@ -442,7 +442,7 @@ exit:
struct wlan_network *_rtw_find_network(_queue *scanned_queue, u8 *addr) struct wlan_network *_rtw_find_network(_queue *scanned_queue, u8 *addr)
{ {
/* _irqL irqL; */ /* unsigned long irqL; */
_list *phead, *plist; _list *phead, *plist;
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
u8 zero_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0}; u8 zero_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
@ -482,7 +482,7 @@ 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;
@ -710,7 +710,7 @@ exit:
struct wlan_network *rtw_find_same_network(_queue *scanned_queue, struct wlan_network *network) struct wlan_network *rtw_find_same_network(_queue *scanned_queue, struct wlan_network *network)
{ {
_irqL irqL; unsigned long irqL;
struct wlan_network *found = NULL; struct wlan_network *found = NULL;
if (scanned_queue == NULL || network == NULL) if (scanned_queue == NULL || network == NULL)
@ -855,7 +855,7 @@ Caller must hold pmlmepriv->lock first.
*/ */
void rtw_update_scanned_network(_adapter *adapter, WLAN_BSSID_EX *target) void rtw_update_scanned_network(_adapter *adapter, WLAN_BSSID_EX *target)
{ {
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
u32 bssid_ex_sz; u32 bssid_ex_sz;
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
@ -996,7 +996,7 @@ 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(_adapter *adapter, WLAN_BSSID_EX *pnetwork) void rtw_add_network(_adapter *adapter, WLAN_BSSID_EX *pnetwork)
{ {
_irqL irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv = &(((_adapter *)adapter)->mlmepriv); struct mlme_priv *pmlmepriv = &(((_adapter *)adapter)->mlmepriv);
/* _queue *queue = &(pmlmepriv->scanned_queue); */ /* _queue *queue = &(pmlmepriv->scanned_queue); */
@ -1088,7 +1088,7 @@ void rtw_atimdone_event_callback(_adapter *adapter , u8 *pbuf)
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;
WLAN_BSSID_EX *pnetwork; WLAN_BSSID_EX *pnetwork;
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
@ -1108,7 +1108,7 @@ void rtw_survey_event_callback(_adapter *adapter, u8 *pbuf)
if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) == _TRUE) { if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) == _TRUE) {
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);
@ -1139,7 +1139,7 @@ exit:
void rtw_surveydone_event_callback(_adapter *adapter, u8 *pbuf) void rtw_surveydone_event_callback(_adapter *adapter, u8 *pbuf)
{ {
_irqL irqL; unsigned long irqL;
u8 timer_cancelled; u8 timer_cancelled;
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
#ifdef CONFIG_RTW_80211R #ifdef CONFIG_RTW_80211R
@ -1309,7 +1309,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;
@ -1348,7 +1348,7 @@ static void rtw_reset_rx_info(struct debug_priv *pdbgpriv)
*/ */
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;
@ -1842,7 +1842,7 @@ static void rtw_joinbss_update_network(_adapter *padapter, struct wlan_network *
/* #define REJOIN */ /* #define REJOIN */
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;
static u8 retry = 0; static u8 retry = 0;
u8 timer_cancelled; u8 timer_cancelled;
struct sta_info *ptarget_sta = NULL, *pcur_sta = NULL; struct sta_info *ptarget_sta = NULL, *pcur_sta = NULL;
@ -2115,7 +2115,7 @@ inline void rtw_sta_media_status_rpt_cmd_hdl(_adapter *adapter, struct sta_media
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;
@ -2224,7 +2224,7 @@ exit:
#ifdef CONFIG_IEEE80211W #ifdef CONFIG_IEEE80211W
void rtw_sta_timeout_event_callback(_adapter *adapter, u8 *pbuf) void rtw_sta_timeout_event_callback(_adapter *adapter, u8 *pbuf)
{ {
_irqL irqL; unsigned long irqL;
struct sta_info *psta; struct sta_info *psta;
struct stadel_event *pstadel = (struct stadel_event *)pbuf; struct stadel_event *pstadel = (struct stadel_event *)pbuf;
struct sta_priv *pstapriv = &adapter->stapriv; struct sta_priv *pstapriv = &adapter->stapriv;
@ -2292,7 +2292,7 @@ void rtw_ft_reassoc_event_callback(_adapter *padapter, u8 *pbuf)
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX *)(&(pmlmeinfo->network)); WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX *)(&(pmlmeinfo->network));
struct cfg80211_ft_event_params ft_evt_parms; struct cfg80211_ft_event_params ft_evt_parms;
_irqL irqL; unsigned long irqL;
memset(&ft_evt_parms, 0, sizeof(ft_evt_parms)); memset(&ft_evt_parms, 0, sizeof(ft_evt_parms));
rtw_update_ft_stainfo(padapter, pnetwork); rtw_update_ft_stainfo(padapter, pnetwork);
@ -2369,7 +2369,7 @@ void rtw_sta_mstatus_report(_adapter *adapter)
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;
struct sta_info *psta; struct sta_info *psta;
struct wlan_network *pwlan = NULL; struct wlan_network *pwlan = NULL;
@ -2550,7 +2550,7 @@ void rtw_wmm_event_callback(PADAPTER padapter, u8 *pbuf)
*/ */
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;
RTW_INFO("%s, fw_state=%x\n", __func__, get_fwstate(pmlmepriv)); RTW_INFO("%s, fw_state=%x\n", __func__, get_fwstate(pmlmepriv));
@ -2622,7 +2622,7 @@ void _rtw_join_timeout_handler(_adapter *adapter)
*/ */
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;
RTW_INFO(FUNC_ADPT_FMT" fw_state=%x\n", FUNC_ADPT_ARG(adapter), get_fwstate(pmlmepriv)); RTW_INFO(FUNC_ADPT_FMT" fw_state=%x\n", FUNC_ADPT_ARG(adapter), get_fwstate(pmlmepriv));
@ -3018,7 +3018,7 @@ exit:
int rtw_select_roaming_candidate(struct mlme_priv *mlme) int rtw_select_roaming_candidate(struct mlme_priv *mlme)
{ {
_irqL irqL; unsigned long irqL;
int ret = _FAIL; int ret = _FAIL;
_list *phead; _list *phead;
_adapter *adapter; _adapter *adapter;
@ -3156,7 +3156,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;
@ -4241,7 +4241,7 @@ inline u8 rtw_to_roam(_adapter *adapter)
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);

42
core/rtw_mlme_ext.c
View file

@ -1614,7 +1614,7 @@ _continue:
#ifdef CONFIG_AUTO_AP_MODE #ifdef CONFIG_AUTO_AP_MODE
if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE && if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE &&
pmlmepriv->cur_network.join_res == _TRUE) { pmlmepriv->cur_network.join_res == _TRUE) {
_irqL irqL; unsigned long irqL;
struct sta_info *psta; struct sta_info *psta;
u8 *mac_addr, *peer_addr; u8 *mac_addr, *peer_addr;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
@ -2025,7 +2025,7 @@ unsigned int OnBeacon(_adapter *padapter, union recv_frame *precv_frame)
rtw_enable_hw_update_tsf_cmd(padapter); rtw_enable_hw_update_tsf_cmd(padapter);
} }
} else if ((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE) { } else if ((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE) {
_irqL irqL; unsigned long irqL;
u8 rate_set[16]; u8 rate_set[16];
u8 rate_num = 0; u8 rate_num = 0;
@ -2076,7 +2076,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, seq, ie_len; unsigned int auth_mode, seq, ie_len;
unsigned char *sa, *p; unsigned char *sa, *p;
u16 algorithm; u16 algorithm;
@ -2435,7 +2435,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, listen_interval; u16 capab_info, listen_interval;
struct rtw_ieee802_11_elems elems; struct rtw_ieee802_11_elems elems;
struct sta_info *pstat; struct sta_info *pstat;
@ -3109,7 +3109,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;
@ -3199,7 +3199,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;
@ -3654,7 +3654,7 @@ u16 rtw_rx_ampdu_apply(_adapter *adapter)
adj_cnt += rx_ampdu_apply_sta(adapter, sta, accept, size); adj_cnt += rx_ampdu_apply_sta(adapter, sta, accept, size);
} else if (mlmeext_msr(mlmeext) == WIFI_FW_AP_STATE) { } else if (mlmeext_msr(mlmeext) == WIFI_FW_AP_STATE) {
_irqL irqL; unsigned long irqL;
_list *phead, *plist; _list *phead, *plist;
u8 peer_num = 0; u8 peer_num = 0;
char peers[NUM_STA]; char peers[NUM_STA];
@ -6806,7 +6806,7 @@ unsigned int OnAction_ft(_adapter *padapter, union recv_frame *precv_frame)
struct mlme_priv *pmlmepriv = NULL; struct mlme_priv *pmlmepriv = NULL;
struct wlan_network *proam_target = NULL; struct wlan_network *proam_target = NULL;
ft_priv *pftpriv = NULL; ft_priv *pftpriv = NULL;
_irqL irqL; unsigned long irqL;
pmlmeext = &padapter->mlmeextpriv; pmlmeext = &padapter->mlmeextpriv;
pmlmeinfo = &(pmlmeext->mlmext_info); pmlmeinfo = &(pmlmeext->mlmext_info);
@ -7267,7 +7267,7 @@ void dump_mgntframe(_adapter *padapter, struct xmit_frame *pmgntframe)
s32 dump_mgntframe_and_wait(_adapter *padapter, struct xmit_frame *pmgntframe, int timeout_ms) s32 dump_mgntframe_and_wait(_adapter *padapter, struct xmit_frame *pmgntframe, int timeout_ms)
{ {
s32 ret = _FAIL; s32 ret = _FAIL;
_irqL irqL; unsigned long irqL;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct xmit_buf *pxmitbuf = pmgntframe->pxmitbuf; struct xmit_buf *pxmitbuf = pmgntframe->pxmitbuf;
struct submit_ctx sctx; struct submit_ctx sctx;
@ -7396,7 +7396,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) && defined (CONFIG_NATIVEAP_MLME) #if defined(CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME)
_irqL irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
#endif /* #if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) */ #endif /* #if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) */
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@ -9399,7 +9399,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;
@ -9892,7 +9892,7 @@ exit:
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;
@ -10668,7 +10668,7 @@ void start_clnt_join(_adapter *padapter)
_list *pos = get_next(head); _list *pos = get_next(head);
struct wlan_network *scanned = NULL; struct wlan_network *scanned = NULL;
u8 ie_offset = 0; u8 ie_offset = 0;
_irqL irqL; unsigned long irqL;
bool has_p2p_ie = _FALSE; bool has_p2p_ie = _FALSE;
_enter_critical_bh(&(padapter->mlmepriv.scanned_queue.lock), &irqL); _enter_critical_bh(&(padapter->mlmepriv.scanned_queue.lock), &irqL);
@ -11481,7 +11481,7 @@ Following are the event callback functions
/* for sta/adhoc mode */ /* for sta/adhoc mode */
void update_sta_info(_adapter *padapter, struct sta_info *psta) void update_sta_info(_adapter *padapter, struct sta_info *psta)
{ {
_irqL irqL; unsigned long irqL;
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;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -11809,7 +11809,7 @@ void _linked_info_dump(_adapter *padapter)
RTW_INFO("AP[" MAC_FMT "] - undecorated_smoothed_pwdb:%d\n", RTW_INFO("AP[" MAC_FMT "] - undecorated_smoothed_pwdb:%d\n",
MAC_ARG(padapter->mlmepriv.cur_network.network.MacAddress), undecorated_smoothed_pwdb); MAC_ARG(padapter->mlmepriv.cur_network.network.MacAddress), undecorated_smoothed_pwdb);
} else if ((pmlmeinfo->state & 0x03) == _HW_STATE_AP_) { } else if ((pmlmeinfo->state & 0x03) == _HW_STATE_AP_) {
_irqL irqL; unsigned long irqL;
_list *phead, *plist; _list *phead, *plist;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
@ -11977,7 +11977,7 @@ void linked_status_chk_tdls(_adapter *padapter)
u8 addr[ETH_ALEN]; u8 addr[ETH_ALEN];
}; };
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
_irqL irqL; unsigned long irqL;
u8 ack_chk; u8 ack_chk;
struct sta_info *psta; struct sta_info *psta;
int i, num_teardown = 0, num_checkalive = 0; int i, num_teardown = 0, num_checkalive = 0;
@ -12254,7 +12254,7 @@ bypass_active_keep_alive:
} /* end of if ((psta = rtw_get_stainfo(pstapriv, passoc_res->network.MacAddress)) != NULL) */ } /* end of if ((psta = rtw_get_stainfo(pstapriv, passoc_res->network.MacAddress)) != NULL) */
} else if (is_client_associated_to_ibss(padapter)) { } else if (is_client_associated_to_ibss(padapter)) {
_irqL irqL; unsigned long irqL;
_list *phead, *plist, dlist; _list *phead, *plist, dlist;
_rtw_init_listhead(&dlist); _rtw_init_listhead(&dlist);
@ -12488,7 +12488,7 @@ void clnt_sa_query_timeout(_adapter *padapter)
void sa_query_timer_hdl(struct sta_info *psta) void sa_query_timer_hdl(struct sta_info *psta)
{ {
_adapter *padapter = psta->padapter; _adapter *padapter = psta->padapter;
_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;
@ -12624,7 +12624,7 @@ void report_ft_event(_adapter *padapter)
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX *)(&(pmlmeinfo->network)); WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX *)(&(pmlmeinfo->network));
struct cfg80211_ft_event_params ft_evt_parms; struct cfg80211_ft_event_params ft_evt_parms;
_irqL irqL; unsigned long irqL;
memset(&ft_evt_parms, 0, sizeof(ft_evt_parms)); memset(&ft_evt_parms, 0, sizeof(ft_evt_parms));
rtw_update_ft_stainfo(padapter, pnetwork); rtw_update_ft_stainfo(padapter, pnetwork);
@ -14532,7 +14532,7 @@ u8 h2c_msg_hdl(_adapter *padapter, unsigned char *pbuf)
u8 chk_bmc_sleepq_hdl(_adapter *padapter, unsigned char *pbuf) u8 chk_bmc_sleepq_hdl(_adapter *padapter, unsigned char *pbuf)
{ {
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
_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;
@ -15027,7 +15027,7 @@ u8 set_csa_hdl(_adapter *padapter, unsigned char *pbuf)
u8 tdls_hdl(_adapter *padapter, unsigned char *pbuf) u8 tdls_hdl(_adapter *padapter, unsigned char *pbuf)
{ {
#ifdef CONFIG_TDLS #ifdef CONFIG_TDLS
_irqL irqL; unsigned long irqL;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; struct tdls_info *ptdlsinfo = &padapter->tdlsinfo;
#ifdef CONFIG_TDLS_CH_SW #ifdef CONFIG_TDLS_CH_SW

4
core/rtw_mp.c
View file

@ -517,7 +517,7 @@ u32 mp_join(PADAPTER padapter, u8 mode)
struct sta_info *psta; struct sta_info *psta;
u32 length; u32 length;
u8 val8, join_type; u8 val8, join_type;
_irqL irqL; unsigned long irqL;
s32 res = _SUCCESS; s32 res = _SUCCESS;
struct mp_priv *pmppriv = &padapter->mppriv; struct mp_priv *pmppriv = &padapter->mppriv;
@ -688,7 +688,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) {
pmppriv->bSetTxPower = 0; pmppriv->bSetTxPower = 0;

4
core/rtw_odm.c
View file

@ -185,7 +185,7 @@ void rtw_odm_get_perpkt_rssi(void *sel, _adapter *adapter)
void rtw_odm_acquirespinlock(_adapter *adapter, enum rt_spinlock_type type) void rtw_odm_acquirespinlock(_adapter *adapter, enum rt_spinlock_type type)
{ {
PHAL_DATA_TYPE pHalData = GET_HAL_DATA(adapter); PHAL_DATA_TYPE pHalData = GET_HAL_DATA(adapter);
_irqL irqL; unsigned long irqL;
switch (type) { switch (type) {
case RT_IQK_SPINLOCK: case RT_IQK_SPINLOCK:
@ -198,7 +198,7 @@ void rtw_odm_acquirespinlock(_adapter *adapter, enum rt_spinlock_type type)
void rtw_odm_releasespinlock(_adapter *adapter, enum rt_spinlock_type type) void rtw_odm_releasespinlock(_adapter *adapter, enum rt_spinlock_type type)
{ {
PHAL_DATA_TYPE pHalData = GET_HAL_DATA(adapter); PHAL_DATA_TYPE pHalData = GET_HAL_DATA(adapter);
_irqL irqL; unsigned long irqL;
switch (type) { switch (type) {
case RT_IQK_SPINLOCK: case RT_IQK_SPINLOCK:

8
core/rtw_p2p.c
View file

@ -45,7 +45,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;
@ -2439,7 +2439,7 @@ u32 process_p2p_devdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le
_rtw_memcmp(pwdinfo->p2p_group_ssid, groupid + ETH_ALEN, pwdinfo->p2p_group_ssid_len)) { _rtw_memcmp(pwdinfo->p2p_group_ssid, groupid + ETH_ALEN, pwdinfo->p2p_group_ssid_len)) {
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);
@ -3075,7 +3075,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;
NDIS_802_11_SSID ssid; NDIS_802_11_SSID ssid;
_irqL irqL; unsigned long irqL;
u8 _status = 0; u8 _status = 0;
@ -4620,7 +4620,7 @@ static void pre_tx_scan_timer_process(struct timer_list *t)
_adapter *adapter = from_timer(adapter, t, wdinfo.pre_tx_scan_timer); _adapter *adapter = from_timer(adapter, t, wdinfo.pre_tx_scan_timer);
#endif #endif
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;

2
core/rtw_pwrctrl.c
View file

@ -773,7 +773,7 @@ void rtw_set_ps_mode(PADAPTER padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode
#endif /* CONFIG_P2P */ #endif /* CONFIG_P2P */
#ifdef CONFIG_TDLS #ifdef CONFIG_TDLS
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
_irqL irqL; unsigned long irqL;
int i, j; int i, j;
_list *plist, *phead; _list *plist, *phead;
struct sta_info *ptdls_sta; struct sta_info *ptdls_sta;

22
core/rtw_recv.c
View file

@ -239,7 +239,7 @@ union recv_frame *_rtw_alloc_recvframe(_queue *pfree_recv_queue)
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);
@ -261,7 +261,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;
@ -325,7 +325,7 @@ sint _rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue)
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;
/* _spinlock(&pfree_recv_queue->lock); */ /* _spinlock(&pfree_recv_queue->lock); */
_enter_critical_bh(&queue->lock, &irqL); _enter_critical_bh(&queue->lock, &irqL);
@ -397,7 +397,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);
@ -410,7 +410,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);
@ -423,7 +423,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;
@ -1591,7 +1591,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;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -2708,7 +2708,7 @@ void recv_indicatepkts_pkt_loss_cnt(struct debug_priv *pdbgpriv, u64 prev_seq, u
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(_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)
{ {
/* _irqL irql; */ /* unsigned long irql; */
/* u8 bcancelled; */ /* u8 bcancelled; */
_list *phead, *plist; _list *phead, *plist;
union recv_frame *prframe; union recv_frame *prframe;
@ -2800,7 +2800,7 @@ int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *pre
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;
@ -2952,7 +2952,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;
@ -4060,7 +4060,7 @@ void rx_query_phy_status(
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
struct dvobj_priv *psdpriv = padapter->dvobj; struct dvobj_priv *psdpriv = padapter->dvobj;
struct debug_priv *pdbgpriv = &psdpriv->drv_dbg; struct debug_priv *pdbgpriv = &psdpriv->drv_dbg;
/* _irqL irqL; */ /* unsigned long irqL; */
pkt_info.is_packet_match_bssid = _FALSE; pkt_info.is_packet_match_bssid = _FALSE;
pkt_info.is_packet_to_self = _FALSE; pkt_info.is_packet_to_self = _FALSE;

4
core/rtw_sreset.c
View file

@ -55,7 +55,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;
val32 = rtw_read32(padapter, REG_TXDMA_STATUS); val32 = rtw_read32(padapter, REG_TXDMA_STATUS);
@ -271,7 +271,7 @@ void sreset_reset(_adapter *padapter)
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
_irqL irqL; unsigned long irqL;
u32 start = rtw_get_current_time(); u32 start = rtw_get_current_time();
struct dvobj_priv *psdpriv = padapter->dvobj; struct dvobj_priv *psdpriv = padapter->dvobj;
struct debug_priv *pdbgpriv = &psdpriv->drv_dbg; struct debug_priv *pdbgpriv = &psdpriv->drv_dbg;

28
core/rtw_sta_mgt.c
View file

@ -42,7 +42,7 @@ inline void rtw_st_ctl_init(struct st_ctl_t *st_ctl)
inline void rtw_st_ctl_clear_tracker_q(struct st_ctl_t *st_ctl) inline void rtw_st_ctl_clear_tracker_q(struct st_ctl_t *st_ctl)
{ {
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
struct session_tracker *st; struct session_tracker *st;
@ -133,7 +133,7 @@ inline bool rtw_st_ctl_chk_reg_rule(struct st_ctl_t *st_ctl, _adapter *adapter,
void dump_st_ctl(void *sel, struct st_ctl_t *st_ctl) void dump_st_ctl(void *sel, struct st_ctl_t *st_ctl)
{ {
int i; int i;
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
struct session_tracker *st; struct session_tracker *st;
@ -352,7 +352,7 @@ void rtw_mfree_stainfo(struct sta_info *psta)
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;
@ -394,7 +394,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;
@ -443,7 +443,7 @@ u32 _rtw_free_sta_priv(struct sta_priv *pstapriv)
/* struct sta_info *rtw_alloc_stainfo(_queue *pfree_sta_queue, unsigned char *hwaddr) */ /* struct sta_info *rtw_alloc_stainfo(_queue *pfree_sta_queue, unsigned char *hwaddr) */
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;
uint tmp_aid; uint tmp_aid;
s32 index; s32 index;
_list *phash_list; _list *phash_list;
@ -560,7 +560,7 @@ 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;
@ -665,7 +665,7 @@ u32 rtw_free_stainfo(_adapter *padapter , struct sta_info *psta)
/* 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;
@ -773,7 +773,7 @@ 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;
@ -826,7 +826,7 @@ 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;
@ -931,7 +931,7 @@ const char *const _acl_mode_str[] = {
u8 rtw_access_ctrl(_adapter *adapter, u8 *mac_addr) u8 rtw_access_ctrl(_adapter *adapter, u8 *mac_addr)
{ {
u8 res = _TRUE; u8 res = _TRUE;
_irqL irqL; unsigned long irqL;
_list *list, *head; _list *list, *head;
struct rtw_wlan_acl_node *acl_node; struct rtw_wlan_acl_node *acl_node;
u8 match = _FALSE; u8 match = _FALSE;
@ -988,7 +988,7 @@ bool rtw_is_pre_link_sta(struct sta_priv *stapriv, u8 *addr)
struct sta_info *sta = NULL; struct sta_info *sta = NULL;
u8 exist = _FALSE; u8 exist = _FALSE;
int i; int i;
_irqL irqL; unsigned long irqL;
_enter_critical_bh(&(pre_link_sta_ctl->lock), &irqL); _enter_critical_bh(&(pre_link_sta_ctl->lock), &irqL);
for (i = 0; i < RTW_PRE_LINK_STA_NUM; i++) { for (i = 0; i < RTW_PRE_LINK_STA_NUM; i++) {
@ -1015,7 +1015,7 @@ struct sta_info *rtw_pre_link_sta_add(struct sta_priv *stapriv, u8 *hwaddr)
struct sta_info *sta = NULL; struct sta_info *sta = NULL;
u8 exist = _FALSE; u8 exist = _FALSE;
int i; int i;
_irqL irqL; unsigned long irqL;
if (rtw_check_invalid_mac_address(hwaddr, _FALSE) == _TRUE) if (rtw_check_invalid_mac_address(hwaddr, _FALSE) == _TRUE)
goto exit; goto exit;
@ -1068,7 +1068,7 @@ void rtw_pre_link_sta_del(struct sta_priv *stapriv, u8 *hwaddr)
struct sta_info *sta = NULL; struct sta_info *sta = NULL;
u8 exist = _FALSE; u8 exist = _FALSE;
int i; int i;
_irqL irqL; unsigned long irqL;
if (rtw_check_invalid_mac_address(hwaddr, _FALSE) == _TRUE) if (rtw_check_invalid_mac_address(hwaddr, _FALSE) == _TRUE)
goto exit; goto exit;
@ -1110,7 +1110,7 @@ void rtw_pre_link_sta_ctl_reset(struct sta_priv *stapriv)
struct pre_link_sta_node_t *node = NULL; struct pre_link_sta_node_t *node = NULL;
struct sta_info *sta = NULL; struct sta_info *sta = NULL;
int i, j = 0; int i, j = 0;
_irqL irqL; unsigned long irqL;
u8 addrs[RTW_PRE_LINK_STA_NUM][ETH_ALEN]; u8 addrs[RTW_PRE_LINK_STA_NUM][ETH_ALEN];

16
core/rtw_tdls.c
View file

@ -268,7 +268,7 @@ void free_tdls_sta(_adapter *padapter, struct sta_info *ptdls_sta)
{ {
struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; struct tdls_info *ptdlsinfo = &padapter->tdlsinfo;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
_irqL irqL; unsigned long irqL;
/* free peer sta_info */ /* free peer sta_info */
_enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL); _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
@ -887,7 +887,7 @@ int issue_tdls_setup_req(_adapter *padapter, struct tdls_txmgmt *ptxmgmt, int wa
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct sta_info *ptdls_sta = NULL; struct sta_info *ptdls_sta = NULL;
_irqL irqL; unsigned long irqL;
int ret = _FAIL; int ret = _FAIL;
/* Retry timer should be set at least 301 sec, using TPK_count counting 301 times. */ /* Retry timer should be set at least 301 sec, using TPK_count counting 301 times. */
u32 timeout_interval = TDLS_TPK_RESEND_COUNT; u32 timeout_interval = TDLS_TPK_RESEND_COUNT;
@ -966,7 +966,7 @@ int _issue_tdls_teardown(_adapter *padapter, struct tdls_txmgmt *ptxmgmt, u8 wai
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct sta_info *ptdls_sta = NULL; struct sta_info *ptdls_sta = NULL;
_irqL irqL; unsigned long irqL;
int ret = _FAIL; int ret = _FAIL;
RTW_INFO("[TDLS] %s\n", __func__); RTW_INFO("[TDLS] %s\n", __func__);
@ -1487,7 +1487,7 @@ sint On_TDLS_Setup_Req(_adapter *padapter, union recv_frame *precv_frame)
u8 *ptr = precv_frame->u.hdr.rx_data; u8 *ptr = precv_frame->u.hdr.rx_data;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
_irqL irqL; unsigned long irqL;
struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib; struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib;
u8 *prsnie, *ppairwise_cipher; u8 *prsnie, *ppairwise_cipher;
u8 i, k; u8 i, k;
@ -1686,7 +1686,7 @@ int On_TDLS_Setup_Rsp(_adapter *padapter, union recv_frame *precv_frame)
struct sta_info *ptdls_sta = NULL; struct sta_info *ptdls_sta = NULL;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
u8 *ptr = precv_frame->u.hdr.rx_data; u8 *ptr = precv_frame->u.hdr.rx_data;
_irqL irqL; unsigned long irqL;
struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib; struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib;
u8 *psa; u8 *psa;
u16 status_code = 0; u16 status_code = 0;
@ -1863,7 +1863,7 @@ int On_TDLS_Setup_Cfm(_adapter *padapter, union recv_frame *precv_frame)
struct sta_info *ptdls_sta = NULL; struct sta_info *ptdls_sta = NULL;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
u8 *ptr = precv_frame->u.hdr.rx_data; u8 *ptr = precv_frame->u.hdr.rx_data;
_irqL irqL; unsigned long irqL;
struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib; struct rx_pkt_attrib *prx_pkt_attrib = &precv_frame->u.hdr.attrib;
u8 *psa; u8 *psa;
u16 status_code = 0; u16 status_code = 0;
@ -2039,7 +2039,7 @@ int On_TDLS_Teardown(_adapter *padapter, union recv_frame *precv_frame)
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct sta_info *ptdls_sta = NULL; struct sta_info *ptdls_sta = NULL;
_irqL irqL; unsigned long irqL;
u8 reason; u8 reason;
reason = *(ptr + prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len + LLC_HEADER_SIZE + ETH_TYPE_LEN + PAYLOAD_TYPE_LEN + 2); reason = *(ptr + prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len + LLC_HEADER_SIZE + ETH_TYPE_LEN + PAYLOAD_TYPE_LEN + 2);
@ -2102,7 +2102,7 @@ int On_TDLS_Peer_Traffic_Rsp(_adapter *padapter, union recv_frame *precv_frame)
/* If it's a direct link and have buffered frame */ /* If it's a direct link and have buffered frame */
if (ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE) { if (ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE) {
if (wmmps_ac) { if (wmmps_ac) {
_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;

36
core/rtw_wlan_util.c
View file

@ -844,7 +844,7 @@ void invalidate_cam_all(_adapter *padapter)
{ {
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter); struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl; struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl;
_irqL irqL; unsigned long irqL;
u8 val8 = 0; u8 val8 = 0;
rtw_hal_set_hwreg(padapter, HW_VAR_CAM_INVALID_ALL, &val8); rtw_hal_set_hwreg(padapter, HW_VAR_CAM_INVALID_ALL, &val8);
@ -883,7 +883,7 @@ inline void write_cam_from_cache(_adapter *adapter, u8 id)
{ {
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl; struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl;
_irqL irqL; unsigned long irqL;
struct sec_cam_ent cache; struct sec_cam_ent cache;
_enter_critical_bh(&cam_ctl->lock, &irqL); _enter_critical_bh(&cam_ctl->lock, &irqL);
@ -896,7 +896,7 @@ void write_cam_cache(_adapter *adapter, u8 id, u16 ctrl, u8 *mac, u8 *key)
{ {
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl; struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl;
_irqL irqL; unsigned long irqL;
_enter_critical_bh(&cam_ctl->lock, &irqL); _enter_critical_bh(&cam_ctl->lock, &irqL);
@ -911,7 +911,7 @@ void clear_cam_cache(_adapter *adapter, u8 id)
{ {
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl; struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl;
_irqL irqL; unsigned long irqL;
_enter_critical_bh(&cam_ctl->lock, &irqL); _enter_critical_bh(&cam_ctl->lock, &irqL);
@ -942,7 +942,7 @@ inline void rtw_camctl_set_flags(_adapter *adapter, u32 flags)
{ {
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl; struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl;
_irqL irqL; unsigned long irqL;
_enter_critical_bh(&cam_ctl->lock, &irqL); _enter_critical_bh(&cam_ctl->lock, &irqL);
_rtw_camctl_set_flags(adapter, flags); _rtw_camctl_set_flags(adapter, flags);
@ -961,7 +961,7 @@ inline void rtw_camctl_clr_flags(_adapter *adapter, u32 flags)
{ {
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl; struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl;
_irqL irqL; unsigned long irqL;
_enter_critical_bh(&cam_ctl->lock, &irqL); _enter_critical_bh(&cam_ctl->lock, &irqL);
_rtw_camctl_clr_flags(adapter, flags); _rtw_camctl_clr_flags(adapter, flags);
@ -1123,7 +1123,7 @@ exit:
inline bool rtw_sec_camid_is_used(struct cam_ctl_t *cam_ctl, u8 id) inline bool rtw_sec_camid_is_used(struct cam_ctl_t *cam_ctl, u8 id)
{ {
_irqL irqL; unsigned long irqL;
bool ret; bool ret;
_enter_critical_bh(&cam_ctl->lock, &irqL); _enter_critical_bh(&cam_ctl->lock, &irqL);
@ -1137,7 +1137,7 @@ u8 rtw_get_sec_camid(_adapter *adapter, u8 max_bk_key_num, u8 *sec_key_id)
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl; struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl;
int i; int i;
_irqL irqL; unsigned long irqL;
u8 sec_cam_num = 0; u8 sec_cam_num = 0;
_enter_critical_bh(&cam_ctl->lock, &irqL); _enter_critical_bh(&cam_ctl->lock, &irqL);
@ -1177,7 +1177,7 @@ inline bool rtw_camid_is_gk(_adapter *adapter, u8 cam_id)
{ {
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl; struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl;
_irqL irqL; unsigned long irqL;
bool ret; bool ret;
_enter_critical_bh(&cam_ctl->lock, &irqL); _enter_critical_bh(&cam_ctl->lock, &irqL);
@ -1235,7 +1235,7 @@ s16 rtw_camid_search(_adapter *adapter, u8 *addr, s16 kid, s8 gk)
{ {
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl; struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl;
_irqL irqL; unsigned long irqL;
s16 cam_id = -1; s16 cam_id = -1;
_enter_critical_bh(&cam_ctl->lock, &irqL); _enter_critical_bh(&cam_ctl->lock, &irqL);
@ -1304,7 +1304,7 @@ s16 rtw_camid_alloc(_adapter *adapter, struct sta_info *sta, u8 kid, bool *used)
struct mlme_ext_info *mlmeinfo = &adapter->mlmeextpriv.mlmext_info; struct mlme_ext_info *mlmeinfo = &adapter->mlmeextpriv.mlmext_info;
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl; struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl;
_irqL irqL; unsigned long irqL;
s16 cam_id = -1; s16 cam_id = -1;
*used = _FALSE; *used = _FALSE;
@ -1359,7 +1359,7 @@ static void rtw_camid_set(_adapter *adapter, u8 cam_id)
{ {
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl; struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl;
_irqL irqL; unsigned long irqL;
_enter_critical_bh(&cam_ctl->lock, &irqL); _enter_critical_bh(&cam_ctl->lock, &irqL);
@ -1373,7 +1373,7 @@ void rtw_camid_free(_adapter *adapter, u8 cam_id)
{ {
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl; struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl;
_irqL irqL; unsigned long irqL;
_enter_critical_bh(&cam_ctl->lock, &irqL); _enter_critical_bh(&cam_ctl->lock, &irqL);
@ -1389,7 +1389,7 @@ inline void rtw_sec_cam_swap(_adapter *adapter, u8 cam_id_a, u8 cam_id_b)
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl; struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl;
struct sec_cam_ent cache_a, cache_b; struct sec_cam_ent cache_a, cache_b;
_irqL irqL; unsigned long irqL;
bool cam_a_used, cam_b_used; bool cam_a_used, cam_b_used;
if (1) if (1)
@ -1442,7 +1442,7 @@ static s16 rtw_get_empty_cam_entry(_adapter *adapter, u8 start_camid)
{ {
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl; struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl;
_irqL irqL; unsigned long irqL;
int i; int i;
s16 cam_id = -1; s16 cam_id = -1;
@ -3231,7 +3231,7 @@ inline s8 rtw_macid_get_ch_g(struct macid_ctl_t *macid_ctl, u8 id)
void rtw_alloc_macid(_adapter *padapter, struct sta_info *psta) void rtw_alloc_macid(_adapter *padapter, struct sta_info *psta)
{ {
int i; int i;
_irqL irqL; unsigned long irqL;
u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter); struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
struct macid_ctl_t *macid_ctl = dvobj_to_macidctl(dvobj); struct macid_ctl_t *macid_ctl = dvobj_to_macidctl(dvobj);
@ -3350,7 +3350,7 @@ exit:
void rtw_release_macid(_adapter *padapter, struct sta_info *psta) void rtw_release_macid(_adapter *padapter, struct sta_info *psta)
{ {
_irqL irqL; unsigned long irqL;
u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter); struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
struct macid_ctl_t *macid_ctl = dvobj_to_macidctl(dvobj); struct macid_ctl_t *macid_ctl = dvobj_to_macidctl(dvobj);
@ -3422,7 +3422,7 @@ u8 rtw_search_max_mac_id(_adapter *padapter)
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter); struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
struct macid_ctl_t *macid_ctl = dvobj_to_macidctl(dvobj); struct macid_ctl_t *macid_ctl = dvobj_to_macidctl(dvobj);
int i; int i;
_irqL irqL; unsigned long irqL;
/* TODO: Only search for connected macid? */ /* TODO: Only search for connected macid? */

50
core/rtw_xmit.c
View file

@ -2473,7 +2473,7 @@ s32 rtw_mgmt_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame
struct rtw_ieee80211_hdr *pwlanhdr; struct rtw_ieee80211_hdr *pwlanhdr;
u8 MME[_MME_IE_LENGTH_]; u8 MME[_MME_IE_LENGTH_];
_irqL irqL; unsigned long irqL;
u32 ori_len; u32 ori_len;
mem_start = pframe = (u8 *)(pxmitframe->buf_addr) + TXDESC_OFFSET; mem_start = pframe = (u8 *)(pxmitframe->buf_addr) + TXDESC_OFFSET;
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
@ -2805,7 +2805,7 @@ struct xmit_frame *__rtw_alloc_cmdxmitframe(struct xmit_priv *pxmitpriv,
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;
@ -2847,7 +2847,7 @@ struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv)
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;
if (pxmitbuf == NULL) if (pxmitbuf == NULL)
@ -2870,7 +2870,7 @@ s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
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;
@ -2918,7 +2918,7 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv)
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;
/* RTW_INFO("+rtw_free_xmitbuf\n"); */ /* RTW_INFO("+rtw_free_xmitbuf\n"); */
@ -3000,7 +3000,7 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)/* (_queue *p
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;
@ -3029,7 +3029,7 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)/* (_queue *p
struct xmit_frame *rtw_alloc_xmitframe_ext(struct xmit_priv *pxmitpriv) struct xmit_frame *rtw_alloc_xmitframe_ext(struct xmit_priv *pxmitpriv)
{ {
_irqL irqL; unsigned long irqL;
struct xmit_frame *pxframe = NULL; struct xmit_frame *pxframe = NULL;
_list *plist, *phead; _list *plist, *phead;
_queue *queue = &pxmitpriv->free_xframe_ext_queue; _queue *queue = &pxmitpriv->free_xframe_ext_queue;
@ -3085,7 +3085,7 @@ 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 *queue = NULL; _queue *queue = NULL;
_adapter *padapter = pxmitpriv->adapter; _adapter *padapter = pxmitpriv->adapter;
_pkt *pndis_pkt = NULL; _pkt *pndis_pkt = NULL;
@ -3137,7 +3137,7 @@ 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;
@ -3208,7 +3208,7 @@ static struct xmit_frame *get_one_xmitframe(struct xmit_priv *pxmitpriv, struct
static struct xmit_frame *rtw_get_xframe(struct xmit_priv *pxmitpriv, int *num_frame) static struct xmit_frame *rtw_get_xframe(struct xmit_priv *pxmitpriv, int *num_frame)
{ {
_irqL irqL0; unsigned long irqL0;
_list *sta_plist, *sta_phead; _list *sta_plist, *sta_phead;
struct hw_xmit *phwxmit_i = pxmitpriv->hwxmits; struct hw_xmit *phwxmit_i = pxmitpriv->hwxmits;
sint entry = pxmitpriv->hwxmit_entry; sint entry = pxmitpriv->hwxmit_entry;
@ -3265,7 +3265,7 @@ exit:
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;
@ -3373,7 +3373,7 @@ struct tx_servq *rtw_get_sta_pending(_adapter *padapter, struct sta_info *psta,
*/ */
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;
@ -3523,7 +3523,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;
@ -3902,7 +3902,7 @@ s32 rtw_xmit(_adapter *padapter, _pkt **ppkt)
static u32 start = 0; static u32 start = 0;
static u32 drop_cnt = 0; static u32 drop_cnt = 0;
#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;
@ -4006,7 +4006,7 @@ sint xmitframe_enqueue_for_tdls_sleeping_sta(_adapter *padapter, struct xmit_fra
{ {
sint ret = _FALSE; sint ret = _FALSE;
_irqL irqL; unsigned long irqL;
struct sta_info *ptdls_sta = NULL; struct sta_info *ptdls_sta = NULL;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct pkt_attrib *pattrib = &pxmitframe->attrib; struct pkt_attrib *pattrib = &pxmitframe->attrib;
@ -4114,7 +4114,7 @@ inline bool xmitframe_hiq_filter(struct xmit_frame *xmitframe)
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;
@ -4327,7 +4327,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;
@ -4377,7 +4377,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;
@ -4550,7 +4550,7 @@ _exit:
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;
@ -4639,7 +4639,7 @@ void enqueue_pending_xmitbuf(
struct xmit_priv *pxmitpriv, struct xmit_priv *pxmitpriv,
struct xmit_buf *pxmitbuf) struct xmit_buf *pxmitbuf)
{ {
_irqL irql; unsigned long irql;
_queue *pqueue; _queue *pqueue;
_adapter *pri_adapter = pxmitpriv->adapter; _adapter *pri_adapter = pxmitpriv->adapter;
@ -4656,7 +4656,7 @@ void enqueue_pending_xmitbuf_to_head(
struct xmit_priv *pxmitpriv, struct xmit_priv *pxmitpriv,
struct xmit_buf *pxmitbuf) struct xmit_buf *pxmitbuf)
{ {
_irqL irql; unsigned long irql;
_queue *pqueue = &pxmitpriv->pending_xmitbuf_queue; _queue *pqueue = &pxmitpriv->pending_xmitbuf_queue;
_enter_critical_bh(&pqueue->lock, &irql); _enter_critical_bh(&pqueue->lock, &irql);
@ -4668,7 +4668,7 @@ void enqueue_pending_xmitbuf_to_head(
struct xmit_buf *dequeue_pending_xmitbuf( struct xmit_buf *dequeue_pending_xmitbuf(
struct xmit_priv *pxmitpriv) struct xmit_priv *pxmitpriv)
{ {
_irqL irql; unsigned long irql;
struct xmit_buf *pxmitbuf; struct xmit_buf *pxmitbuf;
_queue *pqueue; _queue *pqueue;
@ -4694,7 +4694,7 @@ struct xmit_buf *dequeue_pending_xmitbuf(
static struct xmit_buf *dequeue_pending_xmitbuf_under_survey( static struct xmit_buf *dequeue_pending_xmitbuf_under_survey(
struct xmit_priv *pxmitpriv) struct xmit_priv *pxmitpriv)
{ {
_irqL irql; unsigned long irql;
struct xmit_buf *pxmitbuf; struct xmit_buf *pxmitbuf;
struct xmit_frame *pxmitframe; struct xmit_frame *pxmitframe;
_queue *pqueue; _queue *pqueue;
@ -4741,7 +4741,7 @@ static struct xmit_buf *dequeue_pending_xmitbuf_under_survey(
static struct xmit_buf *dequeue_pending_xmitbuf_ext( static struct xmit_buf *dequeue_pending_xmitbuf_ext(
struct xmit_priv *pxmitpriv) struct xmit_priv *pxmitpriv)
{ {
_irqL irql; unsigned long irql;
struct xmit_buf *pxmitbuf; struct xmit_buf *pxmitbuf;
_queue *pqueue; _queue *pqueue;
@ -4795,7 +4795,7 @@ struct xmit_buf *select_and_dequeue_pending_xmitbuf(_adapter *padapter)
sint check_pending_xmitbuf( sint check_pending_xmitbuf(
struct xmit_priv *pxmitpriv) struct xmit_priv *pxmitpriv)
{ {
_irqL irql; unsigned long irql;
_queue *pqueue; _queue *pqueue;
sint ret = _FALSE; sint ret = _FALSE;

16
hal/hal_btcoex.c
View file

@ -655,7 +655,7 @@ u32 halbtcoutsrc_GetBtPatchVer(PBTC_COEXIST pBtCoexist)
{ {
if (pBtCoexist->bt_info.get_bt_fw_ver_cnt <= 5) { if (pBtCoexist->bt_info.get_bt_fw_ver_cnt <= 5) {
if (halbtcoutsrc_IsHwMailboxExist(pBtCoexist) == _TRUE) { if (halbtcoutsrc_IsHwMailboxExist(pBtCoexist) == _TRUE) {
_irqL irqL; unsigned long irqL;
u8 ret; u8 ret;
_enter_critical_mutex(&GLBtcBtMpOperLock, &irqL); _enter_critical_mutex(&GLBtcBtMpOperLock, &irqL);
@ -706,7 +706,7 @@ u32 halbtcoutsrc_GetBtCoexSupportedFeature(void *pBtcContext)
if (halbtcoutsrc_IsHwMailboxExist(pBtCoexist) == _TRUE) { if (halbtcoutsrc_IsHwMailboxExist(pBtCoexist) == _TRUE) {
u8 buf[3] = {0}; u8 buf[3] = {0};
_irqL irqL; unsigned long irqL;
u8 op_code; u8 op_code;
u8 status; u8 status;
@ -737,7 +737,7 @@ u32 halbtcoutsrc_GetBtCoexSupportedVersion(void *pBtcContext)
if (halbtcoutsrc_IsHwMailboxExist(pBtCoexist) == _TRUE) { if (halbtcoutsrc_IsHwMailboxExist(pBtCoexist) == _TRUE) {
u8 buf[3] = {0}; u8 buf[3] = {0};
_irqL irqL; unsigned long irqL;
u8 op_code; u8 op_code;
u8 status; u8 status;
@ -1549,7 +1549,7 @@ u16 halbtcoutsrc_SetBtReg(void *pBtcContext, u8 RegType, u32 RegAddr, u32 Data)
if (halbtcoutsrc_IsHwMailboxExist(pBtCoexist) == _TRUE) { if (halbtcoutsrc_IsHwMailboxExist(pBtCoexist) == _TRUE) {
u8 buf[3] = {0}; u8 buf[3] = {0};
_irqL irqL; unsigned long irqL;
u8 op_code; u8 op_code;
u8 status; u8 status;
@ -1601,7 +1601,7 @@ u16 halbtcoutsrc_GetBtReg_with_status(void *pBtcContext, u8 RegType, u32 RegAddr
if (halbtcoutsrc_IsHwMailboxExist(pBtCoexist) == _TRUE) { if (halbtcoutsrc_IsHwMailboxExist(pBtCoexist) == _TRUE) {
u8 buf[3] = {0}; u8 buf[3] = {0};
_irqL irqL; unsigned long irqL;
u8 op_code; u8 op_code;
u8 status; u8 status;
@ -1764,7 +1764,7 @@ u8 halbtcoutsrc_GetBleScanTypeFromBt(void *pBtcContext)
if (halbtcoutsrc_IsHwMailboxExist(pBtCoexist) == _TRUE) { if (halbtcoutsrc_IsHwMailboxExist(pBtCoexist) == _TRUE) {
u8 buf[3] = {0}; u8 buf[3] = {0};
_irqL irqL; unsigned long irqL;
u8 op_code; u8 op_code;
u8 status; u8 status;
@ -1796,7 +1796,7 @@ u32 halbtcoutsrc_GetBleScanParaFromBt(void *pBtcContext, u8 scanType)
if (halbtcoutsrc_IsHwMailboxExist(pBtCoexist) == _TRUE) { if (halbtcoutsrc_IsHwMailboxExist(pBtCoexist) == _TRUE) {
u8 buf[3] = {0}; u8 buf[3] = {0};
_irqL irqL; unsigned long irqL;
u8 op_code; u8 op_code;
u8 status; u8 status;
@ -1822,7 +1822,7 @@ u8 halbtcoutsrc_GetBtAFHMapFromBt(void *pBtcContext, u8 mapType, u8 *afhMap)
{ {
struct btc_coexist *pBtCoexist = (struct btc_coexist *)pBtcContext; struct btc_coexist *pBtCoexist = (struct btc_coexist *)pBtcContext;
u8 buf[2] = {0}; u8 buf[2] = {0};
_irqL irqL; unsigned long irqL;
u8 op_code; u8 op_code;
u32 *AfhMapL = (u32 *)&(afhMap[0]); u32 *AfhMapL = (u32 *)&(afhMap[0]);
u32 *AfhMapM = (u32 *)&(afhMap[4]); u32 *AfhMapM = (u32 *)&(afhMap[4]);

30
hal/hal_com.c
View file

@ -82,7 +82,7 @@ void rtw_hal_read_sta_dk_key(_adapter *adapter, u8 key_id)
struct security_priv *psecuritypriv = &adapter->securitypriv; struct security_priv *psecuritypriv = &adapter->securitypriv;
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl; struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl;
_irqL irqL; unsigned long irqL;
u8 get_key[16]; u8 get_key[16];
memset(get_key, 0, sizeof(get_key)); memset(get_key, 0, sizeof(get_key));
@ -2066,7 +2066,7 @@ void rtw_mbid_cam_deinit(struct dvobj_priv *dvobj)
void rtw_mbid_cam_reset(_adapter *adapter) void rtw_mbid_cam_reset(_adapter *adapter)
{ {
_irqL irqL; unsigned long irqL;
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
struct mbid_cam_ctl_t *mbid_cam_ctl = &dvobj->mbid_cam_ctl; struct mbid_cam_ctl_t *mbid_cam_ctl = &dvobj->mbid_cam_ctl;
@ -2096,7 +2096,7 @@ static u8 _rtw_mbid_cam_search_by_macaddr(_adapter *adapter, u8 *mac_addr)
u8 rtw_mbid_cam_search_by_macaddr(_adapter *adapter, u8 *mac_addr) u8 rtw_mbid_cam_search_by_macaddr(_adapter *adapter, u8 *mac_addr)
{ {
_irqL irqL; unsigned long irqL;
u8 cam_id = INVALID_CAM_ID; u8 cam_id = INVALID_CAM_ID;
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
@ -2129,7 +2129,7 @@ static u8 _rtw_mbid_cam_search_by_ifaceid(_adapter *adapter, u8 iface_id)
u8 rtw_mbid_cam_search_by_ifaceid(_adapter *adapter, u8 iface_id) u8 rtw_mbid_cam_search_by_ifaceid(_adapter *adapter, u8 iface_id)
{ {
_irqL irqL; unsigned long irqL;
u8 cam_id = INVALID_CAM_ID; u8 cam_id = INVALID_CAM_ID;
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
struct mbid_cam_ctl_t *mbid_cam_ctl = &dvobj->mbid_cam_ctl; struct mbid_cam_ctl_t *mbid_cam_ctl = &dvobj->mbid_cam_ctl;
@ -2142,7 +2142,7 @@ u8 rtw_mbid_cam_search_by_ifaceid(_adapter *adapter, u8 iface_id)
} }
u8 rtw_get_max_mbid_cam_id(_adapter *adapter) u8 rtw_get_max_mbid_cam_id(_adapter *adapter)
{ {
_irqL irqL; unsigned long irqL;
s8 i; s8 i;
u8 cam_id = INVALID_CAM_ID; u8 cam_id = INVALID_CAM_ID;
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
@ -2185,7 +2185,7 @@ static inline void mbid_cam_cache_clr(struct mbid_cam_cache *pmbid_cam)
u8 rtw_mbid_camid_alloc(_adapter *adapter, u8 *mac_addr) u8 rtw_mbid_camid_alloc(_adapter *adapter, u8 *mac_addr)
{ {
_irqL irqL; unsigned long irqL;
u8 cam_id = INVALID_CAM_ID, i; u8 cam_id = INVALID_CAM_ID, i;
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
struct mbid_cam_ctl_t *mbid_cam_ctl = &dvobj->mbid_cam_ctl; struct mbid_cam_ctl_t *mbid_cam_ctl = &dvobj->mbid_cam_ctl;
@ -2225,7 +2225,7 @@ exit:
u8 rtw_mbid_cam_info_change(_adapter *adapter, u8 *mac_addr) u8 rtw_mbid_cam_info_change(_adapter *adapter, u8 *mac_addr)
{ {
_irqL irqL; unsigned long irqL;
u8 entry_id = INVALID_CAM_ID; u8 entry_id = INVALID_CAM_ID;
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
struct mbid_cam_ctl_t *mbid_cam_ctl = &dvobj->mbid_cam_ctl; struct mbid_cam_ctl_t *mbid_cam_ctl = &dvobj->mbid_cam_ctl;
@ -2242,7 +2242,7 @@ u8 rtw_mbid_cam_info_change(_adapter *adapter, u8 *mac_addr)
u8 rtw_mbid_cam_assign(_adapter *adapter, u8 *mac_addr, u8 camid) u8 rtw_mbid_cam_assign(_adapter *adapter, u8 *mac_addr, u8 camid)
{ {
_irqL irqL; unsigned long irqL;
u8 ret = _FALSE; u8 ret = _FALSE;
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
struct mbid_cam_ctl_t *mbid_cam_ctl = &dvobj->mbid_cam_ctl; struct mbid_cam_ctl_t *mbid_cam_ctl = &dvobj->mbid_cam_ctl;
@ -2279,7 +2279,7 @@ exit:
void rtw_mbid_camid_clean(_adapter *adapter, u8 mbss_canid) void rtw_mbid_camid_clean(_adapter *adapter, u8 mbss_canid)
{ {
_irqL irqL; unsigned long irqL;
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
struct mbid_cam_ctl_t *mbid_cam_ctl = &dvobj->mbid_cam_ctl; struct mbid_cam_ctl_t *mbid_cam_ctl = &dvobj->mbid_cam_ctl;
@ -2296,7 +2296,7 @@ void rtw_mbid_camid_clean(_adapter *adapter, u8 mbss_canid)
} }
int rtw_mbid_cam_cache_dump(void *sel, const char *fun_name, _adapter *adapter) int rtw_mbid_cam_cache_dump(void *sel, const char *fun_name, _adapter *adapter)
{ {
_irqL irqL; unsigned long irqL;
u8 i; u8 i;
_adapter *iface; _adapter *iface;
u8 iface_id; u8 iface_id;
@ -2369,7 +2369,7 @@ static void read_mbssid_cam(_adapter *padapter, u8 cam_addr, u8 *mac)
} }
int rtw_mbid_cam_dump(void *sel, const char *fun_name, _adapter *adapter) int rtw_mbid_cam_dump(void *sel, const char *fun_name, _adapter *adapter)
{ {
/*_irqL irqL;*/ /*unsigned long irqL;*/
u8 i; u8 i;
u8 mac_addr[ETH_ALEN]; u8 mac_addr[ETH_ALEN];
@ -3475,7 +3475,7 @@ static void rtw_hal_update_gtk_offload_info(_adapter *adapter)
struct security_priv *psecuritypriv = &adapter->securitypriv; struct security_priv *psecuritypriv = &adapter->securitypriv;
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl; struct cam_ctl_t *cam_ctl = &dvobj->cam_ctl;
_irqL irqL; unsigned long irqL;
u8 get_key[16]; u8 get_key[16];
u8 gtk_id = 0, offset = 0, i = 0, sz = 0; u8 gtk_id = 0, offset = 0, i = 0, sz = 0;
u64 replay_count = 0; u64 replay_count = 0;
@ -4203,7 +4203,7 @@ static void rtw_hal_construct_P2PBeacon(_adapter *padapter, u8 *pframe, u32 *pLe
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
u32 pktlen; u32 pktlen;
/* #if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) */ /* #if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) */
/* _irqL irqL; /* unsigned long irqL;
* struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); * struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
* #endif */ /* #if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) */ * #endif */ /* #if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) */
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -8403,7 +8403,7 @@ void SetHalODMVar(
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
struct PHY_DM_STRUCT *podmpriv = &pHalData->odmpriv; struct PHY_DM_STRUCT *podmpriv = &pHalData->odmpriv;
/* _irqL irqL; */ /* unsigned long irqL; */
switch (eVariable) { switch (eVariable) {
case HAL_ODM_STA_INFO: { case HAL_ODM_STA_INFO: {
struct sta_info *psta = (struct sta_info *)pValue1; struct sta_info *psta = (struct sta_info *)pValue1;
@ -8991,7 +8991,7 @@ void rtw_dump_raw_rssi_info(_adapter *padapter, void *sel)
#ifdef DBG_RX_DFRAME_RAW_DATA #ifdef DBG_RX_DFRAME_RAW_DATA
void rtw_dump_rx_dframe_info(_adapter *padapter, void *sel) void rtw_dump_rx_dframe_info(_adapter *padapter, void *sel)
{ {
_irqL irqL; unsigned long irqL;
u8 isCCKrate, rf_path; u8 isCCKrate, rf_path;
struct recv_priv *precvpriv = &(padapter->recvpriv); struct recv_priv *precvpriv = &(padapter->recvpriv);
PHAL_DATA_TYPE pHalData = GET_HAL_DATA(padapter); PHAL_DATA_TYPE pHalData = GET_HAL_DATA(padapter);

4
hal/hal_mcc.c
View file

@ -1268,7 +1268,7 @@ void rtw_hal_mcc_c2h_handler(PADAPTER padapter, u8 buflen, u8 *tmpBuf)
struct mcc_obj_priv *pmccobjpriv = &(adapter_to_dvobj(padapter)->mcc_objpriv); struct mcc_obj_priv *pmccobjpriv = &(adapter_to_dvobj(padapter)->mcc_objpriv);
struct mcc_adapter_priv *pmccadapriv = &padapter->mcc_adapterpriv; struct mcc_adapter_priv *pmccadapriv = &padapter->mcc_adapterpriv;
struct submit_ctx *mcc_sctx = &pmccobjpriv->mcc_sctx; struct submit_ctx *mcc_sctx = &pmccobjpriv->mcc_sctx;
_irqL irqL; unsigned long irqL;
/* RTW_INFO("[length]=%d, [C2H data]="MAC_FMT"\n", buflen, MAC_ARG(tmpBuf)); */ /* RTW_INFO("[length]=%d, [C2H data]="MAC_FMT"\n", buflen, MAC_ARG(tmpBuf)); */
/* To avoid reg is set, but driver recive c2h to set wrong oper_channel */ /* To avoid reg is set, but driver recive c2h to set wrong oper_channel */
@ -1330,7 +1330,7 @@ void rtw_hal_mcc_sw_status_check(PADAPTER padapter)
struct mcc_obj_priv *pmccobjpriv = &(dvobj->mcc_objpriv); struct mcc_obj_priv *pmccobjpriv = &(dvobj->mcc_objpriv);
struct pwrctrl_priv *pwrpriv = dvobj_to_pwrctl(dvobj); struct pwrctrl_priv *pwrpriv = dvobj_to_pwrctl(dvobj);
u8 cur_cnt = 0, prev_cnt = 0, diff_cnt = 0, check_ret = _FAIL; u8 cur_cnt = 0, prev_cnt = 0, diff_cnt = 0, check_ret = _FAIL;
_irqL irqL; unsigned long irqL;
/* #define MCC_RESTART 1 */ /* #define MCC_RESTART 1 */

4
hal/rtl8188e_phycfg.c
View file

@ -559,7 +559,7 @@ PHY_QueryRFReg8188E(
u32 Original_Value, Readback_Value, BitShift; u32 Original_Value, Readback_Value, BitShift;
/* HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); */ /* HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); */
/* u8 RFWaitCounter = 0; */ /* u8 RFWaitCounter = 0; */
/* _irqL irqL; */ /* unsigned long irqL; */
#if (DISABLE_BB_RF == 1) #if (DISABLE_BB_RF == 1)
return 0; return 0;
@ -605,7 +605,7 @@ PHY_SetRFReg8188E(
/* HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); */ /* HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); */
/* u8 RFWaitCounter = 0; */ /* u8 RFWaitCounter = 0; */
u32 Original_Value, BitShift; u32 Original_Value, BitShift;
/* _irqL irqL; */ /* unsigned long irqL; */
#if (DISABLE_BB_RF == 1) #if (DISABLE_BB_RF == 1)
return; return;

4
hal/rtl8188eu_xmit.c
View file

@ -695,7 +695,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 */
@ -1070,7 +1070,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;

18
include/osdep_service_linux.h
View file

@ -159,8 +159,6 @@ typedef unsigned char _buffer;
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_;
@ -220,37 +218,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))
@ -263,7 +261,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);

2
include/rtw_mp_ioctl.h
View file

@ -70,7 +70,7 @@ typedef struct _DR_VARIABLE_STRUCT_ {
/* int mp_start_joinbss(_adapter *padapter, NDIS_802_11_SSID *pssid); */ /* int mp_start_joinbss(_adapter *padapter, NDIS_802_11_SSID *pssid); */
/* void _irqlevel_changed_(_irqL *irqlevel, boolunsigned char bLower); */ /* void _irqlevel_changed_(unsigned long *irqlevel, boolunsigned char bLower); */
#define _irqlevel_changed_(a, b) #define _irqlevel_changed_(a, b)
/* oid_rtl_seg_81_80_00 */ /* oid_rtl_seg_81_80_00 */

22
os_dep/ioctl_cfg80211.c
View file

@ -1836,7 +1836,7 @@ exit:
void rtw_cfg80211_indicate_scan_done(_adapter *adapter, bool aborted) void rtw_cfg80211_indicate_scan_done(_adapter *adapter, bool aborted)
{ {
struct rtw_wdev_priv *pwdev_priv = adapter_wdev_data(adapter); struct rtw_wdev_priv *pwdev_priv = adapter_wdev_data(adapter);
_irqL irqL; unsigned long irqL;
#if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE) #if (KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE)
struct cfg80211_scan_info info; struct cfg80211_scan_info info;
@ -1952,7 +1952,7 @@ exit:
static void _rtw_cfg80211_surveydone_event_callback(_adapter *padapter, struct cfg80211_scan_request *scan_req) static void _rtw_cfg80211_surveydone_event_callback(_adapter *padapter, struct cfg80211_scan_request *scan_req)
{ {
_irqL irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
_queue *queue = &(pmlmepriv->scanned_queue); _queue *queue = &(pmlmepriv->scanned_queue);
@ -2113,7 +2113,7 @@ u8 rtw_cfg80211_scan_via_buddy(_adapter *padapter, struct cfg80211_scan_request
int i; int i;
u8 ret = _FALSE; u8 ret = _FALSE;
_adapter *iface = NULL; _adapter *iface = NULL;
_irqL irqL; unsigned long irqL;
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter); struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
struct rtw_wdev_priv *pwdev_priv = adapter_wdev_data(padapter); struct rtw_wdev_priv *pwdev_priv = adapter_wdev_data(padapter);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -2163,7 +2163,7 @@ void rtw_cfg80211_indicate_scan_done_for_buddy(_adapter *padapter, bool bscan_ab
int i; int i;
u8 ret = 0; u8 ret = 0;
_adapter *iface = NULL; _adapter *iface = NULL;
_irqL irqL; unsigned long irqL;
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter); struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
struct mlme_priv *mlmepriv; struct mlme_priv *mlmepriv;
struct rtw_wdev_priv *wdev_priv; struct rtw_wdev_priv *wdev_priv;
@ -2210,7 +2210,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
NDIS_802_11_SSID ssid[RTW_SSID_SCAN_AMOUNT]; NDIS_802_11_SSID ssid[RTW_SSID_SCAN_AMOUNT];
struct rtw_ieee80211_channel ch[RTW_CHANNEL_SCAN_AMOUNT]; struct rtw_ieee80211_channel ch[RTW_CHANNEL_SCAN_AMOUNT];
struct rtw_ieee80211_channel *pch; struct rtw_ieee80211_channel *pch;
_irqL irqL; unsigned long irqL;
u8 *wps_ie = NULL; u8 *wps_ie = NULL;
uint wps_ielen = 0; uint wps_ielen = 0;
u8 *p2p_ie = NULL; u8 *p2p_ie = NULL;
@ -2943,7 +2943,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
struct cfg80211_connect_params *sme) struct cfg80211_connect_params *sme)
{ {
int ret = 0; int ret = 0;
_irqL irqL; unsigned long irqL;
_list *phead; _list *phead;
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
NDIS_802_11_AUTHENTICATION_MODE authmode; NDIS_802_11_AUTHENTICATION_MODE authmode;
@ -4172,7 +4172,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev
) )
{ {
int ret = 0; int ret = 0;
_irqL irqL; unsigned long irqL;
_list *phead, *plist; _list *phead, *plist;
u8 updated = _FALSE; u8 updated = _FALSE;
const u8 *target_mac; const u8 *target_mac;
@ -4300,7 +4300,7 @@ static int cfg80211_rtw_dump_station(struct wiphy *wiphy, struct net_device *nde
{ {
int ret = 0; int ret = 0;
_irqL irqL; unsigned long irqL;
_adapter *padapter = (_adapter *)rtw_netdev_priv(ndev); _adapter *padapter = (_adapter *)rtw_netdev_priv(ndev);
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
@ -4874,7 +4874,7 @@ static s32 cfg80211_rtw_update_ft_ies(struct wiphy *wiphy,
_adapter *padapter = NULL; _adapter *padapter = NULL;
struct mlme_priv *pmlmepriv = NULL; struct mlme_priv *pmlmepriv = NULL;
ft_priv *pftpriv = NULL; ft_priv *pftpriv = NULL;
_irqL irqL; unsigned long irqL;
u8 *p; u8 *p;
u8 *pie = NULL; u8 *pie = NULL;
u32 ie_len = 0; u32 ie_len = 0;
@ -5217,7 +5217,7 @@ inline int rtw_cfg80211_is_p2p_scan(_adapter *adapter)
* 2. RTW_DEDICATED_P2P_DEVICE not defined * 2. RTW_DEDICATED_P2P_DEVICE not defined
*/ */
struct rtw_wdev_priv *wdev_data = adapter_wdev_data(adapter); struct rtw_wdev_priv *wdev_data = adapter_wdev_data(adapter);
_irqL irqL; unsigned long irqL;
int is_p2p_scan = 0; int is_p2p_scan = 0;
_enter_critical_bh(&wdev_data->scan_req_lock, &irqL); _enter_critical_bh(&wdev_data->scan_req_lock, &irqL);
@ -5344,7 +5344,7 @@ inline int rtw_cfg80211_is_scan_by_pd_wdev(_adapter *adapter)
struct wiphy *wiphy = adapter_to_wiphy(adapter); struct wiphy *wiphy = adapter_to_wiphy(adapter);
struct rtw_wdev_priv *wdev_data = adapter_wdev_data(adapter); struct rtw_wdev_priv *wdev_data = adapter_wdev_data(adapter);
struct wireless_dev *wdev = NULL; struct wireless_dev *wdev = NULL;
_irqL irqL; unsigned long irqL;
_enter_critical_bh(&wdev_data->scan_req_lock, &irqL); _enter_critical_bh(&wdev_data->scan_req_lock, &irqL);
if (wdev_data->scan_request) if (wdev_data->scan_request)

42
os_dep/ioctl_linux.c
View file

@ -1758,7 +1758,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;
@ -2118,7 +2118,7 @@ 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);
@ -2218,7 +2218,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;
@ -3612,7 +3612,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];
@ -4201,7 +4201,7 @@ static int rtw_p2p_get_wps_configmethod(struct net_device *dev,
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev); _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
u8 peerMAC[ETH_ALEN] = { 0x00 }; u8 peerMAC[ETH_ALEN] = { 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;
@ -4331,7 +4331,7 @@ static int rtw_p2p_get_go_device_address(struct net_device *dev,
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev); _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
u8 peerMAC[ETH_ALEN] = { 0x00 }; u8 peerMAC[ETH_ALEN] = { 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;
@ -4417,7 +4417,7 @@ static int rtw_p2p_get_device_type(struct net_device *dev,
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev); _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
u8 peerMAC[ETH_ALEN] = { 0x00 }; u8 peerMAC[ETH_ALEN] = { 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;
@ -4492,7 +4492,7 @@ static int rtw_p2p_get_device_name(struct net_device *dev,
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev); _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
u8 peerMAC[ETH_ALEN] = { 0x00 }; u8 peerMAC[ETH_ALEN] = { 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;
@ -4562,7 +4562,7 @@ static int rtw_p2p_get_invitation_procedure(struct net_device *dev,
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev); _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
u8 peerMAC[ETH_ALEN] = { 0x00 }; u8 peerMAC[ETH_ALEN] = { 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;
@ -4646,7 +4646,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;
@ -4793,7 +4793,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;
/* Commented by Albert 20120321 */ /* Commented by Albert 20120321 */
@ -4976,7 +4976,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;
/* Commented by Albert 20120328 */ /* Commented by Albert 20120328 */
@ -5097,7 +5097,7 @@ static int rtw_p2p_set_pc(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;
uint uintPeerChannel = 0; uint uintPeerChannel = 0;
struct wifi_display_info *pwfd_info = pwdinfo->wfd_info; struct wifi_display_info *pwfd_info = pwdinfo->wfd_info;
@ -5319,7 +5319,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;
/* Commented by Albert 20110301 */ /* Commented by Albert 20110301 */
/* The input data contains two informations. */ /* The input data contains two informations. */
@ -5870,7 +5870,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;
@ -7126,7 +7126,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; */
@ -7145,7 +7145,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);
@ -7205,7 +7205,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);
@ -10111,7 +10111,7 @@ static int rtw_tdls_enable(struct net_device *dev,
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev); _adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; struct tdls_info *ptdlsinfo = &padapter->tdlsinfo;
_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;
@ -11042,7 +11042,7 @@ static s32 createpseudoadhoc(PADAPTER padapter)
u8 *pibss; u8 *pibss;
u8 ssid[] = "pseduo_ad-hoc"; u8 ssid[] = "pseduo_ad-hoc";
s32 err; s32 err;
_irqL irqL; unsigned long irqL;
pmlmepriv = &padapter->mlmepriv; pmlmepriv = &padapter->mlmepriv;
@ -11109,7 +11109,7 @@ static struct xmit_frame *createloopbackpkt(PADAPTER padapter, u32 size)
u8 *pkt_start, *pkt_end, *ptr; u8 *pkt_start, *pkt_end, *ptr;
struct rtw_ieee80211_hdr *hdr; struct rtw_ieee80211_hdr *hdr;
s32 bmcast; s32 bmcast;
_irqL irqL; unsigned long irqL;
if ((TXDESC_SIZE + WLANHDR_OFFSET + size) > MAX_XMITBUF_SZ) if ((TXDESC_SIZE + WLANHDR_OFFSET + size) > MAX_XMITBUF_SZ)

2
os_dep/mlme_linux.c
View file

@ -228,7 +228,7 @@ void rtw_reset_securitypriv(_adapter *adapter)
u8 backupTKIPCountermeasure = 0x00; u8 backupTKIPCountermeasure = 0x00;
u32 backupTKIPcountermeasure_time = 0; u32 backupTKIPcountermeasure_time = 0;
/* add for CONFIG_IEEE80211W, none 11w also can use */ /* add for CONFIG_IEEE80211W, none 11w also can use */
_irqL irqL; unsigned long irqL;
struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv;
_enter_critical_bh(&adapter->security_key_mutex, &irqL); _enter_critical_bh(&adapter->security_key_mutex, &irqL);

2
os_dep/rtw_proc.c
View file

@ -601,7 +601,7 @@ static int proc_get_rx_info_msg(struct seq_file *m, void *v)
} }
static int proc_get_tx_info_msg(struct seq_file *m, void *v) static int proc_get_tx_info_msg(struct seq_file *m, void *v)
{ {
_irqL irqL; unsigned long irqL;
struct net_device *dev = m->private; struct net_device *dev = m->private;
_adapter *adapter = (_adapter *)rtw_netdev_priv(dev); _adapter *adapter = (_adapter *)rtw_netdev_priv(dev);
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);

4
os_dep/usb_ops_linux.c
View file

@ -371,7 +371,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;
/* struct xmit_frame *pxmitframe = (struct xmit_frame *)pxmitbuf->priv_data; */ /* struct xmit_frame *pxmitframe = (struct xmit_frame *)pxmitbuf->priv_data; */
@ -507,7 +507,7 @@ check_completion:
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;

4
os_dep/xmit_linux.c
View file

@ -264,7 +264,7 @@ void rtw_os_xmit_complete(_adapter *padapter, struct xmit_frame *pxframe)
void rtw_os_xmit_schedule(_adapter *padapter) void rtw_os_xmit_schedule(_adapter *padapter)
{ {
_irqL irqL; unsigned long irqL;
struct xmit_priv *pxmitpriv; struct xmit_priv *pxmitpriv;
if (!padapter) if (!padapter)
@ -336,7 +336,7 @@ 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;