mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-05-08 14:33:05 +00:00
rtl8188eu: Remove most typedef statements from include/osdep_service.h
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
parent
26b163f24f
commit
e2285839e9
46 changed files with 531 additions and 733 deletions
|
|
@ -53,7 +53,7 @@ void init_mlme_ap_info(struct adapter *padapter)
|
|||
|
||||
void free_mlme_ap_info(struct adapter *padapter)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
struct sta_info *psta=NULL;
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
|
|
@ -326,8 +326,8 @@ u8 chk_sta_is_alive(struct sta_info *psta)
|
|||
|
||||
void expire_timeout_chk(struct adapter *padapter)
|
||||
{
|
||||
_irqL irqL;
|
||||
_list *phead, *plist;
|
||||
unsigned long irqL;
|
||||
struct list_head *phead, *plist;
|
||||
u8 updated;
|
||||
struct sta_info *psta=NULL;
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
|
|
@ -615,7 +615,7 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level)
|
|||
|
||||
void update_bmc_sta(struct adapter *padapter)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
u32 init_rate=0;
|
||||
unsigned char network_type, raid;
|
||||
int i, supportRateNum = 0;
|
||||
|
|
@ -720,7 +720,7 @@ void update_bmc_sta(struct adapter *padapter)
|
|||
|
||||
void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct security_priv *psecuritypriv = &padapter->securitypriv;
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
|
|
@ -1331,14 +1331,14 @@ void rtw_set_macaddr_acl(struct adapter *padapter, int mode)
|
|||
|
||||
int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)
|
||||
{
|
||||
_irqL irqL;
|
||||
_list *plist, *phead;
|
||||
unsigned long irqL;
|
||||
struct list_head *plist, *phead;
|
||||
u8 added = false;
|
||||
int i, ret=0;
|
||||
struct rtw_wlan_acl_node *paclnode;
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
|
||||
_queue *pacl_node_q =&pacl_list->acl_node_q;
|
||||
struct __queue *pacl_node_q =&pacl_list->acl_node_q;
|
||||
|
||||
DBG_871X("%s(acl_num=%d)=" MAC_FMT "\n", __func__, pacl_list->num, MAC_ARG(addr));
|
||||
|
||||
|
|
@ -1405,13 +1405,13 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)
|
|||
|
||||
int rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)
|
||||
{
|
||||
_irqL irqL;
|
||||
_list *plist, *phead;
|
||||
unsigned long irqL;
|
||||
struct list_head *plist, *phead;
|
||||
int i, ret=0;
|
||||
struct rtw_wlan_acl_node *paclnode;
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
|
||||
_queue *pacl_node_q =&pacl_list->acl_node_q;
|
||||
struct __queue *pacl_node_q =&pacl_list->acl_node_q;
|
||||
|
||||
DBG_871X("%s(acl_num=%d)=" MAC_FMT "\n", __func__, pacl_list->num, MAC_ARG(addr));
|
||||
|
||||
|
|
@ -1608,7 +1608,7 @@ static void update_bcn_vendor_spec_ie(struct adapter *padapter, u8*oui)
|
|||
|
||||
void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
struct mlme_priv *pmlmepriv;
|
||||
struct mlme_ext_priv *pmlmeext;
|
||||
/* struct mlme_ext_info *pmlmeinfo; */
|
||||
|
|
@ -1771,8 +1771,8 @@ void associated_clients_update(struct adapter *padapter, u8 updated)
|
|||
/* update associcated stations cap. */
|
||||
if(updated == true)
|
||||
{
|
||||
_irqL irqL;
|
||||
_list *phead, *plist;
|
||||
unsigned long irqL;
|
||||
struct list_head *phead, *plist;
|
||||
struct sta_info *psta=NULL;
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
|
||||
|
|
@ -2022,7 +2022,7 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta)
|
|||
|
||||
u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta, bool active, u16 reason)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
u8 beacon_updated = false;
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
|
|
@ -2071,8 +2071,8 @@ u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta, bool active, u16
|
|||
|
||||
int rtw_ap_inform_ch_switch(struct adapter *padapter, u8 new_ch, u8 ch_offset)
|
||||
{
|
||||
_irqL irqL;
|
||||
_list *phead, *plist;
|
||||
unsigned long irqL;
|
||||
struct list_head *phead, *plist;
|
||||
int ret=0;
|
||||
struct sta_info *psta = NULL;
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
|
|
@ -2108,8 +2108,8 @@ int rtw_ap_inform_ch_switch(struct adapter *padapter, u8 new_ch, u8 ch_offset)
|
|||
|
||||
int rtw_sta_flush(struct adapter *padapter)
|
||||
{
|
||||
_irqL irqL;
|
||||
_list *phead, *plist;
|
||||
unsigned long irqL;
|
||||
struct list_head *phead, *plist;
|
||||
int ret=0;
|
||||
struct sta_info *psta = NULL;
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
|
|
@ -2213,8 +2213,8 @@ void rtw_ap_restore_network(struct adapter *padapter)
|
|||
struct sta_priv * pstapriv = &padapter->stapriv;
|
||||
struct sta_info *psta;
|
||||
struct security_priv* psecuritypriv=&(padapter->securitypriv);
|
||||
_irqL irqL;
|
||||
_list *phead, *plist;
|
||||
unsigned long irqL;
|
||||
struct list_head *phead, *plist;
|
||||
u8 chk_alive_num = 0;
|
||||
char chk_alive_list[NUM_STA];
|
||||
int i;
|
||||
|
|
@ -2326,15 +2326,15 @@ void start_ap_mode(struct adapter *padapter)
|
|||
|
||||
void stop_ap_mode(struct adapter *padapter)
|
||||
{
|
||||
_irqL irqL;
|
||||
_list *phead, *plist;
|
||||
unsigned long irqL;
|
||||
struct list_head *phead, *plist;
|
||||
struct rtw_wlan_acl_node *paclnode;
|
||||
struct sta_info *psta=NULL;
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
|
||||
_queue *pacl_node_q =&pacl_list->acl_node_q;
|
||||
struct __queue *pacl_node_q =&pacl_list->acl_node_q;
|
||||
|
||||
pmlmepriv->update_bcn = false;
|
||||
pmlmeext->bstart_bss = false;
|
||||
|
|
|
|||
|
|
@ -380,7 +380,7 @@ static __inline__ void __network_hash_link(struct adapter *priv,
|
|||
struct nat25_network_db_entry *ent, int hash)
|
||||
{
|
||||
/* Caller must spin_lock_bh already! */
|
||||
/* _irqL irqL; */
|
||||
/* unsigned long irqL; */
|
||||
/* spin_lock_bh(&priv->br_ext_lock); */
|
||||
|
||||
ent->next_hash = priv->nethash[hash];
|
||||
|
|
@ -396,7 +396,7 @@ static __inline__ void __network_hash_link(struct adapter *priv,
|
|||
static __inline__ void __network_hash_unlink(struct nat25_network_db_entry *ent)
|
||||
{
|
||||
/* Caller must spin_lock_bh already! */
|
||||
/* _irqL irqL; */
|
||||
/* unsigned long irqL; */
|
||||
/* spin_lock_bh(&priv->br_ext_lock); */
|
||||
|
||||
*(ent->pprev_hash) = ent->next_hash;
|
||||
|
|
@ -413,7 +413,7 @@ static int __nat25_db_network_lookup_and_replace(struct adapter *priv,
|
|||
struct sk_buff *skb, unsigned char *networkAddr)
|
||||
{
|
||||
struct nat25_network_db_entry *db;
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
spin_lock_bh(&priv->br_ext_lock);
|
||||
|
||||
db = priv->nethash[__nat25_network_hash(networkAddr)];
|
||||
|
|
@ -491,7 +491,7 @@ static void __nat25_db_network_insert(struct adapter *priv,
|
|||
{
|
||||
struct nat25_network_db_entry *db;
|
||||
int hash;
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
spin_lock_bh(&priv->br_ext_lock);
|
||||
|
||||
hash = __nat25_network_hash(networkAddr);
|
||||
|
|
@ -537,7 +537,7 @@ static void __nat25_db_print(struct adapter *priv)
|
|||
void nat25_db_cleanup(struct adapter *priv)
|
||||
{
|
||||
int i;
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
spin_lock_bh(&priv->br_ext_lock);
|
||||
|
||||
for(i=0; i<NAT25_HASH_SIZE; i++)
|
||||
|
|
@ -568,7 +568,7 @@ void nat25_db_cleanup(struct adapter *priv)
|
|||
void nat25_db_expire(struct adapter *priv)
|
||||
{
|
||||
int i;
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
spin_lock_bh(&priv->br_ext_lock);
|
||||
|
||||
/* if(!priv->ethBrExtInfo.nat25_disable) */
|
||||
|
|
@ -1355,7 +1355,7 @@ int nat25_handle_frame(struct adapter *priv, struct sk_buff *skb)
|
|||
|
||||
if (!priv->ethBrExtInfo.nat25_disable)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
spin_lock_bh(&priv->br_ext_lock);
|
||||
/*
|
||||
* This function look up the destination network address from
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ exit:
|
|||
}
|
||||
|
||||
#ifdef CONFIG_C2H_WK
|
||||
static void c2h_wk_callback(_workitem *work);
|
||||
static void c2h_wk_callback(struct work_struct *work);
|
||||
#endif
|
||||
sint _rtw_init_evt_priv(struct evt_priv *pevtpriv)
|
||||
{
|
||||
|
|
@ -162,9 +162,9 @@ ISR/Call-Back functions can't call this sub-function.
|
|||
|
||||
*/
|
||||
|
||||
sint _rtw_enqueue_cmd(_queue *queue, struct cmd_obj *obj)
|
||||
sint _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
|
||||
;
|
||||
|
||||
|
|
@ -181,9 +181,9 @@ exit:
|
|||
return _SUCCESS;
|
||||
}
|
||||
|
||||
struct cmd_obj *_rtw_dequeue_cmd(_queue *queue)
|
||||
struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
struct cmd_obj *obj;
|
||||
|
||||
;
|
||||
|
|
@ -357,7 +357,7 @@ void rtw_stop_cmd_thread(struct adapter *adapter)
|
|||
}
|
||||
}
|
||||
|
||||
thread_return rtw_cmd_thread(thread_context context)
|
||||
int rtw_cmd_thread(void * context)
|
||||
{
|
||||
u8 ret;
|
||||
struct cmd_obj *pcmd;
|
||||
|
|
@ -2406,7 +2406,7 @@ exit:
|
|||
}
|
||||
|
||||
#ifdef CONFIG_C2H_WK
|
||||
static void c2h_wk_callback(_workitem *work)
|
||||
static void c2h_wk_callback(struct work_struct *work)
|
||||
{
|
||||
struct evt_priv *evtpriv = container_of(work, struct evt_priv, c2h_wk);
|
||||
struct adapter *adapter = container_of(evtpriv, struct adapter, evtpriv);
|
||||
|
|
@ -2537,7 +2537,7 @@ void rtw_survey_cmd_callback(struct adapter* padapter , struct cmd_obj *pcmd)
|
|||
}
|
||||
void rtw_disassoc_cmd_callback(struct adapter* padapter, struct cmd_obj *pcmd)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
|
||||
;
|
||||
|
|
@ -2586,7 +2586,7 @@ void rtw_joinbss_cmd_callback(struct adapter* padapter, struct cmd_obj *pcmd)
|
|||
|
||||
void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
u8 timer_cancelled;
|
||||
struct sta_info *psta = NULL;
|
||||
struct wlan_network *pwlan = NULL;
|
||||
|
|
@ -2643,7 +2643,7 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
|
|||
}
|
||||
else
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
|
||||
pwlan = _rtw_alloc_network(pmlmepriv);
|
||||
spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
|
||||
|
|
@ -2710,7 +2710,7 @@ exit:
|
|||
|
||||
void rtw_setassocsta_cmdrsp_callback(struct adapter* padapter, struct cmd_obj *pcmd)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
struct sta_priv * pstapriv = &padapter->stapriv;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct set_assocsta_parm* passocsta_parm = (struct set_assocsta_parm*)(pcmd->parmbuf);
|
||||
|
|
|
|||
|
|
@ -942,7 +942,7 @@ int proc_get_all_sta_info(char *page, char **start,
|
|||
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
int i, j;
|
||||
_list *plist, *phead;
|
||||
struct list_head *plist, *phead;
|
||||
struct recv_reorder_ctrl *preorder_ctrl;
|
||||
int len = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -86,11 +86,11 @@ exit:
|
|||
u8 rtw_do_join(struct adapter * padapter);
|
||||
u8 rtw_do_join(struct adapter * padapter)
|
||||
{
|
||||
_irqL irqL;
|
||||
_list *plist, *phead;
|
||||
unsigned long irqL;
|
||||
struct list_head *plist, *phead;
|
||||
u8* pibss = NULL;
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
_queue *queue = &(pmlmepriv->scanned_queue);
|
||||
struct __queue *queue = &(pmlmepriv->scanned_queue);
|
||||
u8 ret=_SUCCESS;
|
||||
|
||||
;
|
||||
|
|
@ -212,7 +212,7 @@ exit:
|
|||
|
||||
u8 rtw_set_802_11_bssid(struct adapter* padapter, u8 *bssid)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
u8 status=_SUCCESS;
|
||||
u32 cur_time = 0;
|
||||
|
||||
|
|
@ -296,7 +296,7 @@ exit:
|
|||
|
||||
u8 rtw_set_802_11_ssid(struct adapter* padapter, struct ndis_802_11_ssid *ssid)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
u8 status = _SUCCESS;
|
||||
u32 cur_time = 0;
|
||||
|
||||
|
|
@ -412,7 +412,7 @@ exit:
|
|||
|
||||
u8 rtw_set_802_11_connect(struct adapter* padapter, u8 *bssid, struct ndis_802_11_ssid *ssid)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
u8 status = _SUCCESS;
|
||||
u32 cur_time = 0;
|
||||
bool bssid_valid = true;
|
||||
|
|
@ -486,7 +486,7 @@ exit:
|
|||
u8 rtw_set_802_11_infrastructure_mode(struct adapter* padapter,
|
||||
enum NDIS_802_11_NETWORK_INFRASTRUCTURE networktype)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct wlan_network *cur_network = &pmlmepriv->cur_network;
|
||||
enum NDIS_802_11_NETWORK_INFRASTRUCTURE* pold_state = &(cur_network->network.InfrastructureMode);
|
||||
|
|
@ -563,7 +563,7 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter* padapter,
|
|||
|
||||
u8 rtw_set_802_11_disassociate(struct adapter *padapter)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
struct mlme_priv * pmlmepriv = &padapter->mlmepriv;
|
||||
|
||||
;
|
||||
|
|
@ -590,7 +590,7 @@ u8 rtw_set_802_11_disassociate(struct adapter *padapter)
|
|||
|
||||
u8 rtw_set_802_11_bssid_list_scan(struct adapter* padapter, struct ndis_802_11_ssid *pssid, int ssid_max_num)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
struct mlme_priv *pmlmepriv= &padapter->mlmepriv;
|
||||
u8 res=true;
|
||||
|
||||
|
|
|
|||
|
|
@ -153,9 +153,9 @@ void _rtw_free_mlme_priv (struct mlme_priv *pmlmepriv)
|
|||
;
|
||||
}
|
||||
|
||||
sint _rtw_enqueue_network(_queue *queue, struct wlan_network *pnetwork)
|
||||
sint _rtw_enqueue_network(struct __queue *queue, struct wlan_network *pnetwork)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
|
||||
;
|
||||
|
||||
|
|
@ -175,9 +175,9 @@ exit:
|
|||
return _SUCCESS;
|
||||
}
|
||||
|
||||
struct wlan_network *_rtw_dequeue_network(_queue *queue)
|
||||
struct wlan_network *_rtw_dequeue_network(struct __queue *queue)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
|
||||
struct wlan_network *pnetwork;
|
||||
|
||||
|
|
@ -205,10 +205,10 @@ struct wlan_network *_rtw_dequeue_network(_queue *queue)
|
|||
|
||||
struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv )/* _queue *free_queue) */
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
struct wlan_network *pnetwork;
|
||||
_queue *free_queue = &pmlmepriv->free_bss_pool;
|
||||
_list* plist = NULL;
|
||||
struct __queue *free_queue = &pmlmepriv->free_bss_pool;
|
||||
struct list_head *plist = NULL;
|
||||
|
||||
;
|
||||
|
||||
|
|
@ -245,8 +245,8 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv ,struct wlan_network *pnetwor
|
|||
{
|
||||
u32 curr_time, delta_time;
|
||||
u32 lifetime = SCANQUEUE_LIFETIME;
|
||||
_irqL irqL;
|
||||
_queue *free_queue = &(pmlmepriv->free_bss_pool);
|
||||
unsigned long irqL;
|
||||
struct __queue *free_queue = &(pmlmepriv->free_bss_pool);
|
||||
|
||||
;
|
||||
|
||||
|
|
@ -291,7 +291,7 @@ exit:
|
|||
void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork)
|
||||
{
|
||||
|
||||
_queue *free_queue = &(pmlmepriv->free_bss_pool);
|
||||
struct __queue *free_queue = &(pmlmepriv->free_bss_pool);
|
||||
|
||||
;
|
||||
|
||||
|
|
@ -323,11 +323,11 @@ exit:
|
|||
|
||||
Shall be calle under atomic context... to avoid possible racing condition...
|
||||
*/
|
||||
struct wlan_network *_rtw_find_network(_queue *scanned_queue, u8 *addr)
|
||||
struct wlan_network *_rtw_find_network(struct __queue *scanned_queue, u8 *addr)
|
||||
{
|
||||
|
||||
/* _irqL irqL; */
|
||||
_list *phead, *plist;
|
||||
/* unsigned long irqL; */
|
||||
struct list_head *phead, *plist;
|
||||
struct wlan_network *pnetwork = NULL;
|
||||
u8 zero_addr[ETH_ALEN] = {0,0,0,0,0,0};
|
||||
|
||||
|
|
@ -369,11 +369,11 @@ exit:
|
|||
|
||||
void _rtw_free_network_queue(struct adapter *padapter, u8 isfreeall)
|
||||
{
|
||||
_irqL irqL;
|
||||
_list *phead, *plist;
|
||||
unsigned long irqL;
|
||||
struct list_head *phead, *plist;
|
||||
struct wlan_network *pnetwork;
|
||||
struct mlme_priv* pmlmepriv = &padapter->mlmepriv;
|
||||
_queue *scanned_queue = &pmlmepriv->scanned_queue;
|
||||
struct __queue *scanned_queue = &pmlmepriv->scanned_queue;
|
||||
|
||||
;
|
||||
|
||||
|
|
@ -478,8 +478,7 @@ void rtw_free_mlme_priv (struct mlme_priv *pmlmepriv)
|
|||
;
|
||||
}
|
||||
|
||||
int rtw_enqueue_network(_queue *queue, struct wlan_network *pnetwork);
|
||||
int rtw_enqueue_network(_queue *queue, struct wlan_network *pnetwork)
|
||||
int rtw_enqueue_network(struct __queue *queue, struct wlan_network *pnetwork)
|
||||
{
|
||||
int res;
|
||||
;
|
||||
|
|
@ -489,7 +488,7 @@ int rtw_enqueue_network(_queue *queue, struct wlan_network *pnetwork)
|
|||
}
|
||||
|
||||
|
||||
static struct wlan_network *rtw_dequeue_network(_queue *queue)
|
||||
static struct wlan_network *rtw_dequeue_network(struct __queue *queue)
|
||||
{
|
||||
struct wlan_network *pnetwork;
|
||||
;
|
||||
|
|
@ -508,7 +507,6 @@ struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv )/* _queue *f
|
|||
return pnetwork;
|
||||
}
|
||||
|
||||
void rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 is_freeall);
|
||||
void rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 is_freeall)/* struct wlan_network *pnetwork, _queue *free_queue) */
|
||||
{
|
||||
;
|
||||
|
|
@ -539,7 +537,7 @@ void rtw_free_network_queue(struct adapter* dev, u8 isfreeall)
|
|||
|
||||
Shall be calle under atomic context... to avoid possible racing condition...
|
||||
*/
|
||||
struct wlan_network *rtw_find_network(_queue *scanned_queue, u8 *addr)
|
||||
struct wlan_network *rtw_find_network(struct __queue *scanned_queue, u8 *addr)
|
||||
{
|
||||
struct wlan_network *pnetwork = _rtw_find_network(scanned_queue, addr);
|
||||
|
||||
|
|
@ -609,11 +607,9 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 fea
|
|||
|
||||
}
|
||||
|
||||
struct wlan_network * rtw_get_oldest_wlan_network(_queue *scanned_queue)
|
||||
struct wlan_network * rtw_get_oldest_wlan_network(struct __queue *scanned_queue)
|
||||
{
|
||||
_list *plist, *phead;
|
||||
|
||||
|
||||
struct list_head *plist, *phead;
|
||||
struct wlan_network *pwlan = NULL;
|
||||
struct wlan_network *oldest = NULL;
|
||||
;
|
||||
|
|
@ -740,13 +736,13 @@ Caller must hold pmlmepriv->lock first.
|
|||
*/
|
||||
void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *target)
|
||||
{
|
||||
_irqL irqL;
|
||||
_list *plist, *phead;
|
||||
unsigned long irqL;
|
||||
struct list_head *plist, *phead;
|
||||
ULONG bssid_ex_sz;
|
||||
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
|
||||
struct mlme_ext_priv *pmlmeext = &(adapter->mlmeextpriv);
|
||||
struct wifidirect_info *pwdinfo= &(adapter->wdinfo);
|
||||
_queue *queue = &(pmlmepriv->scanned_queue);
|
||||
struct __queue *queue = &(pmlmepriv->scanned_queue);
|
||||
struct wlan_network *pnetwork = NULL;
|
||||
struct wlan_network *oldest = NULL;
|
||||
int target_find = 0;
|
||||
|
|
@ -873,13 +869,8 @@ exit:
|
|||
void rtw_add_network(struct adapter *adapter, struct wlan_bssid_ex *pnetwork);
|
||||
void rtw_add_network(struct adapter *adapter, struct wlan_bssid_ex *pnetwork)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
struct mlme_priv *pmlmepriv = &(((struct adapter *)adapter)->mlmepriv);
|
||||
/* _queue *queue = &(pmlmepriv->scanned_queue); */
|
||||
|
||||
;
|
||||
|
||||
/* spin_lock_bh(&queue->lock); */
|
||||
|
||||
#if defined(CONFIG_P2P) && defined(CONFIG_P2P)
|
||||
rtw_wlan_bssid_ex_remove_p2p_attr(pnetwork, P2P_ATTR_GROUP_INFO);
|
||||
|
|
@ -888,10 +879,6 @@ void rtw_add_network(struct adapter *adapter, struct wlan_bssid_ex *pnetwork)
|
|||
update_current_network(adapter, pnetwork);
|
||||
|
||||
rtw_update_scanned_network(adapter, pnetwork);
|
||||
|
||||
/* spin_unlock_bh(&queue->lock); */
|
||||
|
||||
;
|
||||
}
|
||||
|
||||
/* select the desired network based on the capability of the (i)bss. */
|
||||
|
|
@ -974,7 +961,7 @@ void rtw_atimdone_event_callback(struct adapter *adapter , u8 *pbuf)
|
|||
|
||||
void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
u32 len;
|
||||
struct wlan_bssid_ex *pnetwork;
|
||||
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
|
||||
|
|
@ -1002,7 +989,7 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)
|
|||
if(_rtw_memcmp(&(pmlmepriv->cur_network.network.MacAddress), pnetwork->MacAddress, ETH_ALEN))
|
||||
{
|
||||
struct wlan_network* ibss_wlan = NULL;
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
|
||||
memcpy(pmlmepriv->cur_network.network.IEs, pnetwork->IEs, 8);
|
||||
spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
|
||||
|
|
@ -1040,7 +1027,7 @@ exit:
|
|||
|
||||
void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
u8 timer_cancelled = false;
|
||||
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
|
||||
|
||||
|
|
@ -1190,9 +1177,9 @@ void rtw_fwdbg_event_callback(struct adapter *adapter , u8 *pbuf)
|
|||
|
||||
static void free_scanqueue(struct mlme_priv *pmlmepriv)
|
||||
{
|
||||
_queue *free_queue = &pmlmepriv->free_bss_pool;
|
||||
_queue *scan_queue = &pmlmepriv->scanned_queue;
|
||||
_list *plist, *phead, *ptemp;
|
||||
struct __queue *free_queue = &pmlmepriv->free_bss_pool;
|
||||
struct __queue *scan_queue = &pmlmepriv->scanned_queue;
|
||||
struct list_head *plist, *phead, *ptemp;
|
||||
|
||||
RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+free_scanqueue\n"));
|
||||
spin_lock_bh(&scan_queue->lock);
|
||||
|
|
@ -1219,7 +1206,7 @@ static void free_scanqueue(struct mlme_priv *pmlmepriv)
|
|||
*/
|
||||
void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
struct wlan_network* pwlan = NULL;
|
||||
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
|
||||
struct sta_priv *pstapriv = &adapter->stapriv;
|
||||
|
|
@ -1593,7 +1580,7 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net
|
|||
/* define REJOIN */
|
||||
void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
|
||||
{
|
||||
_irqL irqL,irqL2;
|
||||
unsigned long irqL,irqL2;
|
||||
static u8 retry=0;
|
||||
u8 timer_cancelled;
|
||||
struct sta_info *ptarget_sta= NULL, *pcur_sta = NULL;
|
||||
|
|
@ -1808,7 +1795,7 @@ void rtw_sta_media_status_rpt(struct adapter *adapter,struct sta_info *psta, u32
|
|||
|
||||
void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
struct sta_info *psta;
|
||||
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
|
||||
struct stassoc_event *pstassoc = (struct stassoc_event*)pbuf;
|
||||
|
|
@ -1927,7 +1914,7 @@ exit:
|
|||
|
||||
void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
|
||||
{
|
||||
_irqL irqL,irqL2;
|
||||
unsigned long irqL,irqL2;
|
||||
int mac_id=-1;
|
||||
struct sta_info *psta;
|
||||
struct wlan_network* pwlan = NULL;
|
||||
|
|
@ -2057,7 +2044,7 @@ void rtw_cpwm_event_callback(struct adapter *padapter, u8 *pbuf)
|
|||
*/
|
||||
void _rtw_join_timeout_handler (struct adapter *adapter)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
|
||||
int do_join_r;
|
||||
|
||||
|
|
@ -2111,7 +2098,7 @@ void _rtw_join_timeout_handler (struct adapter *adapter)
|
|||
*/
|
||||
void rtw_scan_timeout_handler (struct adapter *adapter)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
|
||||
|
||||
DBG_871X(FUNC_ADPT_FMT" fw_state=%x\n", FUNC_ADPT_ARG(adapter), get_fwstate(pmlmepriv));
|
||||
|
|
@ -2323,11 +2310,11 @@ pmlmepriv->lock
|
|||
|
||||
int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv )
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
int ret;
|
||||
_list *phead;
|
||||
struct list_head *phead;
|
||||
struct adapter *adapter;
|
||||
_queue *queue = &(pmlmepriv->scanned_queue);
|
||||
struct __queue *queue = &(pmlmepriv->scanned_queue);
|
||||
struct wlan_network *pnetwork = NULL;
|
||||
struct wlan_network *candidate = NULL;
|
||||
u8 bSupportAntDiv = false;
|
||||
|
|
|
|||
|
|
@ -1025,7 +1025,7 @@ _END_ONBEACON_:
|
|||
unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)
|
||||
{
|
||||
#ifdef CONFIG_AP_MODE
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
unsigned int auth_mode, seq, ie_len;
|
||||
unsigned char *sa, *p;
|
||||
u16 algorithm;
|
||||
|
|
@ -1329,7 +1329,7 @@ authclnt_fail:
|
|||
unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
|
||||
{
|
||||
#ifdef CONFIG_AP_MODE
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
u16 capab_info, listen_interval;
|
||||
struct rtw_ieee802_11_elems elems;
|
||||
struct sta_info *pstat;
|
||||
|
|
@ -2018,7 +2018,7 @@ unsigned int OnDeAuth(struct adapter *padapter, union recv_frame *precv_frame)
|
|||
#ifdef CONFIG_AP_MODE
|
||||
if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
struct sta_info *psta;
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
|
||||
|
|
@ -2113,7 +2113,7 @@ unsigned int OnDisassoc(struct adapter *padapter, union recv_frame *precv_frame)
|
|||
|
||||
#ifdef CONFIG_AP_MODE
|
||||
if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) {
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
struct sta_info *psta;
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
|
||||
|
|
@ -5562,7 +5562,7 @@ void dump_mgntframe(struct adapter *padapter, struct xmit_frame *pmgntframe)
|
|||
s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntframe, int timeout_ms)
|
||||
{
|
||||
s32 ret = _FAIL;
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
|
||||
struct xmit_buf *pxmitbuf = pmgntframe->pxmitbuf;
|
||||
struct submit_ctx sctx;
|
||||
|
|
@ -5664,7 +5664,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)
|
|||
unsigned int rate_len;
|
||||
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
|
||||
#if defined (CONFIG_AP_MODE)
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
#endif /* if defined (CONFIG_AP_MODE) */
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
|
|
@ -7447,8 +7447,8 @@ exit:
|
|||
|
||||
void issue_action_spct_ch_switch(struct adapter *padapter, u8 *ra, u8 new_ch, u8 ch_offset)
|
||||
{
|
||||
_irqL irqL;
|
||||
_list *plist, *phead;
|
||||
unsigned long irqL;
|
||||
struct list_head *plist, *phead;
|
||||
struct xmit_frame *pmgntframe;
|
||||
struct pkt_attrib *pattrib;
|
||||
unsigned char *pframe;
|
||||
|
|
@ -7750,8 +7750,8 @@ static void issue_action_BA(struct adapter *padapter, unsigned char *raddr,
|
|||
|
||||
static void issue_action_BSSCoexistPacket(struct adapter *padapter)
|
||||
{
|
||||
_irqL irqL;
|
||||
_list *plist, *phead;
|
||||
unsigned long irqL;
|
||||
struct list_head *plist, *phead;
|
||||
unsigned char category, action;
|
||||
struct xmit_frame *pmgntframe;
|
||||
struct pkt_attrib *pattrib;
|
||||
|
|
@ -7763,7 +7763,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter)
|
|||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
_queue *queue = &(pmlmepriv->scanned_queue);
|
||||
struct __queue *queue = &(pmlmepriv->scanned_queue);
|
||||
u8 InfoContent[16] = {0};
|
||||
u8 ICS[8][15];
|
||||
if((pmlmepriv->num_FortyMHzIntolerant==0) || (pmlmepriv->num_sta_no_ht==0))
|
||||
|
|
@ -8548,12 +8548,12 @@ void start_clnt_join(struct adapter* padapter)
|
|||
/* For the Win8 P2P connection, it will be hard to have a successful connection if this Wi-Fi doesn't connect to it. */
|
||||
{
|
||||
#ifdef CONFIG_P2P
|
||||
_queue *queue = &(padapter->mlmepriv.scanned_queue);
|
||||
_list *head = get_list_head(queue);
|
||||
_list *pos = get_next(head);
|
||||
struct __queue *queue = &(padapter->mlmepriv.scanned_queue);
|
||||
struct list_head *head = get_list_head(queue);
|
||||
struct list_head *pos = get_next(head);
|
||||
struct wlan_network *scanned = NULL;
|
||||
u8 ie_offset = 0;
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
bool has_p2p_ie = false;
|
||||
|
||||
spin_lock_bh(&(padapter->mlmepriv.scanned_queue.lock));
|
||||
|
|
@ -9758,7 +9758,7 @@ void sa_query_timer_hdl(struct adapter *padapter)
|
|||
{
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_priv * pmlmepriv = &padapter->mlmepriv;
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
/* disconnect */
|
||||
spin_lock_bh(&pmlmepriv->lock);
|
||||
|
||||
|
|
@ -10507,9 +10507,9 @@ u8 tx_beacon_hdl(struct adapter *padapter, unsigned char *pbuf)
|
|||
#ifdef CONFIG_AP_MODE
|
||||
else /* tx bc/mc frames after update TIM */
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
struct sta_info *psta_bmc;
|
||||
_list *xmitframe_plist, *xmitframe_phead;
|
||||
struct list_head *xmitframe_plist, *xmitframe_phead;
|
||||
struct xmit_frame *pxmitframe=NULL;
|
||||
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
|
|
|
|||
|
|
@ -47,8 +47,8 @@ static int is_any_client_associated(struct adapter *padapter)
|
|||
|
||||
static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf)
|
||||
{
|
||||
_irqL irqL;
|
||||
_list *phead, *plist;
|
||||
unsigned long irqL;
|
||||
struct list_head *phead, *plist;
|
||||
u32 len=0;
|
||||
u16 attr_len = 0;
|
||||
u8 tmplen, *pdata_attr, *pstart, *pcur;
|
||||
|
|
@ -2395,8 +2395,8 @@ u32 process_p2p_devdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le
|
|||
attr_contentlen=0;
|
||||
if(rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_DEVICE_ID, dev_addr, &attr_contentlen))
|
||||
{
|
||||
_irqL irqL;
|
||||
_list *phead, *plist;
|
||||
unsigned long irqL;
|
||||
struct list_head *phead, *plist;
|
||||
|
||||
spin_lock_bh(&pstapriv->asoc_list_lock);
|
||||
phead = &pstapriv->asoc_list;
|
||||
|
|
@ -3136,7 +3136,7 @@ static void find_phase_handler( struct adapter* padapter )
|
|||
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct ndis_802_11_ssid ssid;
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
u8 _status = 0;
|
||||
|
||||
|
||||
|
|
@ -4116,7 +4116,7 @@ static void pre_tx_scan_timer_process (void *FunctionContext)
|
|||
{
|
||||
struct adapter *adapter = (struct adapter *) FunctionContext;
|
||||
struct wifidirect_info *pwdinfo = &adapter->wdinfo;
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
|
||||
u8 _status = 0;
|
||||
|
||||
|
|
|
|||
104
core/rtw_recv.c
104
core/rtw_recv.c
|
|
@ -49,9 +49,6 @@ void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv)
|
|||
|
||||
spin_lock_init(&psta_recvpriv->lock);
|
||||
|
||||
/* for(i=0; i<MAX_RX_NUMBLKS; i++) */
|
||||
/* _rtw_init_queue(&psta_recvpriv->blk_strms[i]); */
|
||||
|
||||
_rtw_init_queue(&psta_recvpriv->defrag_q);
|
||||
|
||||
;
|
||||
|
|
@ -151,11 +148,11 @@ void _rtw_free_recv_priv (struct recv_priv *precvpriv)
|
|||
|
||||
}
|
||||
|
||||
union recv_frame *_rtw_alloc_recvframe (_queue *pfree_recv_queue)
|
||||
union recv_frame *_rtw_alloc_recvframe (struct __queue *pfree_recv_queue)
|
||||
{
|
||||
|
||||
union recv_frame *precvframe;
|
||||
_list *plist, *phead;
|
||||
struct list_head *plist, *phead;
|
||||
struct adapter *padapter;
|
||||
struct recv_priv *precvpriv;
|
||||
;
|
||||
|
|
@ -187,9 +184,9 @@ 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 (struct __queue *pfree_recv_queue)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
union recv_frame *precvframe;
|
||||
|
||||
spin_lock_bh(&pfree_recv_queue->lock);
|
||||
|
|
@ -209,9 +206,9 @@ void rtw_init_recvframe(union recv_frame *precvframe, struct recv_priv *precvpri
|
|||
precvframe->u.hdr.len=0;
|
||||
}
|
||||
|
||||
int rtw_free_recvframe(union recv_frame *precvframe, _queue *pfree_recv_queue)
|
||||
int rtw_free_recvframe(union recv_frame *precvframe, struct __queue *pfree_recv_queue)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
struct adapter *padapter=precvframe->u.hdr.adapter;
|
||||
struct recv_priv *precvpriv = &padapter->recvpriv;
|
||||
|
||||
|
|
@ -237,7 +234,7 @@ int rtw_free_recvframe(union recv_frame *precvframe, _queue *pfree_recv_queue)
|
|||
return _SUCCESS;
|
||||
}
|
||||
|
||||
sint _rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue)
|
||||
sint _rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *queue)
|
||||
{
|
||||
|
||||
struct adapter *padapter=precvframe->u.hdr.adapter;
|
||||
|
|
@ -261,30 +258,18 @@ sint _rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue)
|
|||
return _SUCCESS;
|
||||
}
|
||||
|
||||
sint rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue)
|
||||
sint rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *queue)
|
||||
{
|
||||
sint ret;
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
|
||||
/* _spinlock(&pfree_recv_queue->lock); */
|
||||
spin_lock_bh(&queue->lock);
|
||||
ret = _rtw_enqueue_recvframe(precvframe, queue);
|
||||
/* _rtw_spinunlock(&pfree_recv_queue->lock); */
|
||||
spin_unlock_bh(&queue->lock);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
sint rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue)
|
||||
{
|
||||
return rtw_free_recvframe(precvframe, queue);
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
|
||||
|
||||
/*
|
||||
caller : defrag ; recvframe_chk_defrag in recv_thread (passive)
|
||||
pframequeue: defrag_queue : will be accessed in recv_thread (passive)
|
||||
|
|
@ -293,10 +278,10 @@ using spinlock to protect
|
|||
|
||||
*/
|
||||
|
||||
void rtw_free_recvframe_queue(_queue *pframequeue, _queue *pfree_recv_queue)
|
||||
void rtw_free_recvframe_queue(struct __queue *pframequeue, struct __queue *pfree_recv_queue)
|
||||
{
|
||||
union recv_frame *precvframe;
|
||||
_list *plist, *phead;
|
||||
struct list_head *plist, *phead;
|
||||
|
||||
;
|
||||
_rtw_spinlock(&pframequeue->lock);
|
||||
|
|
@ -335,9 +320,9 @@ u32 rtw_free_uc_swdec_pending_queue(struct adapter *adapter)
|
|||
}
|
||||
|
||||
|
||||
sint rtw_enqueue_recvbuf_to_head(struct recv_buf *precvbuf, _queue *queue)
|
||||
sint rtw_enqueue_recvbuf_to_head(struct recv_buf *precvbuf, struct __queue *queue)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
|
||||
spin_lock_bh(&queue->lock);
|
||||
|
||||
|
|
@ -349,9 +334,9 @@ sint rtw_enqueue_recvbuf_to_head(struct recv_buf *precvbuf, _queue *queue)
|
|||
return _SUCCESS;
|
||||
}
|
||||
|
||||
sint rtw_enqueue_recvbuf(struct recv_buf *precvbuf, _queue *queue)
|
||||
sint rtw_enqueue_recvbuf(struct recv_buf *precvbuf, struct __queue *queue)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
_enter_critical_ex(&queue->lock, &irqL);
|
||||
|
||||
rtw_list_delete(&precvbuf->list);
|
||||
|
|
@ -362,11 +347,11 @@ sint rtw_enqueue_recvbuf(struct recv_buf *precvbuf, _queue *queue)
|
|||
|
||||
}
|
||||
|
||||
struct recv_buf *rtw_dequeue_recvbuf (_queue *queue)
|
||||
struct recv_buf *rtw_dequeue_recvbuf(struct __queue *queue)
|
||||
{
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
struct recv_buf *precvbuf;
|
||||
_list *plist, *phead;
|
||||
struct list_head *plist, *phead;
|
||||
|
||||
_enter_critical_ex(&queue->lock, &irqL);
|
||||
|
||||
|
|
@ -1308,8 +1293,8 @@ sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_
|
|||
|
||||
if((psta->state&WIFI_SLEEP_STATE) && (pstapriv->sta_dz_bitmap&BIT(psta->aid)))
|
||||
{
|
||||
_irqL irqL;
|
||||
_list *xmitframe_plist, *xmitframe_phead;
|
||||
unsigned long irqL;
|
||||
struct list_head *xmitframe_plist, *xmitframe_phead;
|
||||
struct xmit_frame *pxmitframe=NULL;
|
||||
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
|
||||
|
||||
|
|
@ -1967,16 +1952,14 @@ sint wlanhdr_to_ethhdr ( union recv_frame *precvframe)
|
|||
}
|
||||
|
||||
/* perform defrag */
|
||||
static union recv_frame * recvframe_defrag(struct adapter *adapter,_queue *defrag_q)
|
||||
static union recv_frame * recvframe_defrag(struct adapter *adapter, struct __queue *defrag_q)
|
||||
{
|
||||
_list *plist, *phead;
|
||||
struct list_head *plist, *phead;
|
||||
u8 *data,wlanhdr_offset;
|
||||
u8 curfragnum;
|
||||
struct recv_frame_hdr *pfhdr,*pnfhdr;
|
||||
union recv_frame* prframe, *pnextrframe;
|
||||
_queue *pfree_recv_queue;
|
||||
|
||||
;
|
||||
struct __queue *pfree_recv_queue;
|
||||
|
||||
curfragnum=0;
|
||||
pfree_recv_queue=&adapter->recvpriv.free_recv_queue;
|
||||
|
|
@ -2063,11 +2046,9 @@ union recv_frame* recvframe_chk_defrag(struct adapter *padapter, union recv_fram
|
|||
struct recv_frame_hdr *pfhdr;
|
||||
struct sta_info *psta;
|
||||
struct sta_priv *pstapriv;
|
||||
_list *phead;
|
||||
struct list_head *phead;
|
||||
union recv_frame *prtnframe = NULL;
|
||||
_queue *pfree_recv_queue, *pdefrag_q;
|
||||
|
||||
;
|
||||
struct __queue *pfree_recv_queue, *pdefrag_q;
|
||||
|
||||
pstapriv = &padapter->stapriv;
|
||||
|
||||
|
|
@ -2184,7 +2165,6 @@ union recv_frame* recvframe_chk_defrag(struct adapter *padapter, union recv_fram
|
|||
|
||||
#define ENDIAN_FREE 1
|
||||
|
||||
int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe);
|
||||
int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe)
|
||||
{
|
||||
int a_len, padding_len;
|
||||
|
|
@ -2193,9 +2173,9 @@ int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe)
|
|||
unsigned char *pdata;
|
||||
struct rx_pkt_attrib *pattrib;
|
||||
unsigned char *data_ptr;
|
||||
_pkt *sub_skb,*subframes[MAX_SUBFRAME_COUNT];
|
||||
struct sk_buff *sub_skb,*subframes[MAX_SUBFRAME_COUNT];
|
||||
struct recv_priv *precvpriv = &padapter->recvpriv;
|
||||
_queue *pfree_recv_queue = &(precvpriv->free_recv_queue);
|
||||
struct __queue *pfree_recv_queue = &(precvpriv->free_recv_queue);
|
||||
int ret = _SUCCESS;
|
||||
nr_subframes = 0;
|
||||
|
||||
|
|
@ -2425,8 +2405,8 @@ int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union rec
|
|||
int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union recv_frame *prframe)
|
||||
{
|
||||
struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib;
|
||||
_queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
|
||||
_list *phead, *plist;
|
||||
struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
|
||||
struct list_head *phead, *plist;
|
||||
union recv_frame *pnextrframe;
|
||||
struct rx_pkt_attrib *pnextattrib;
|
||||
|
||||
|
|
@ -2462,15 +2442,15 @@ int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union rec
|
|||
int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced);
|
||||
int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced)
|
||||
{
|
||||
/* _irqL irql; */
|
||||
/* unsigned long irql; */
|
||||
/* u8 bcancelled; */
|
||||
_list *phead, *plist;
|
||||
struct list_head *phead, *plist;
|
||||
union recv_frame *prframe;
|
||||
struct rx_pkt_attrib *pattrib;
|
||||
/* u8 index = 0; */
|
||||
int bPktInBuf = false;
|
||||
struct recv_priv *precvpriv = &padapter->recvpriv;
|
||||
_queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
|
||||
struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
|
||||
|
||||
/* DbgPrint("+recv_indicatepkts_in_order\n"); */
|
||||
|
||||
|
|
@ -2576,11 +2556,11 @@ int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctr
|
|||
|
||||
static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *prframe)
|
||||
{
|
||||
_irqL irql;
|
||||
unsigned long irql;
|
||||
int retval = _SUCCESS;
|
||||
struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib;
|
||||
struct recv_reorder_ctrl *preorder_ctrl = prframe->u.hdr.preorder_ctrl;
|
||||
_queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
|
||||
struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
|
||||
|
||||
if(!pattrib->amsdu) {
|
||||
/* s1. */
|
||||
|
|
@ -2693,31 +2673,23 @@ _err_exit:
|
|||
|
||||
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 adapter *padapter = preorder_ctrl->padapter;
|
||||
_queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
|
||||
struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
|
||||
|
||||
|
||||
if(padapter->bDriverStopped ||padapter->bSurpriseRemoved)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
/* DBG_871X("+rtw_reordering_ctrl_timeout_handler()=>\n"); */
|
||||
|
||||
spin_lock_bh(&ppending_recvframe_queue->lock);
|
||||
|
||||
if(recv_indicatepkts_in_order(padapter, preorder_ctrl, true)==true)
|
||||
{
|
||||
_set_timer(&preorder_ctrl->reordering_ctrl_timer, REORDER_WAIT_TIME);
|
||||
}
|
||||
|
||||
spin_unlock_bh(&ppending_recvframe_queue->lock);
|
||||
|
||||
}
|
||||
|
||||
int process_recv_indicatepkts(struct adapter *padapter, union recv_frame *prframe);
|
||||
int process_recv_indicatepkts(struct adapter *padapter, union recv_frame *prframe)
|
||||
{
|
||||
int retval = _SUCCESS;
|
||||
|
|
@ -2780,7 +2752,7 @@ static int recv_func_prehandle(struct adapter *padapter, union recv_frame *rfram
|
|||
int ret = _SUCCESS;
|
||||
struct rx_pkt_attrib *pattrib = &rframe->u.hdr.attrib;
|
||||
struct recv_priv *precvpriv = &padapter->recvpriv;
|
||||
_queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue;
|
||||
struct __queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue;
|
||||
|
||||
|
||||
/* check the frame crtl field and decache */
|
||||
|
|
@ -2802,7 +2774,7 @@ static int recv_func_posthandle(struct adapter *padapter, union recv_frame *prfr
|
|||
union recv_frame *orig_prframe = prframe;
|
||||
struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib;
|
||||
struct recv_priv *precvpriv = &padapter->recvpriv;
|
||||
_queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue;
|
||||
struct __queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue;
|
||||
|
||||
/* DATA FRAME */
|
||||
rtw_led_control(padapter, LED_CTL_RX);
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ u8 sreset_get_wifi_status(struct adapter *padapter)
|
|||
|
||||
u8 status = WIFI_STATUS_SUCCESS;
|
||||
u32 val32 = 0;
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
if(psrtpriv->silent_reset_inprogress == true)
|
||||
{
|
||||
return status;
|
||||
|
|
@ -257,7 +257,7 @@ void sreset_reset(struct adapter *padapter)
|
|||
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
u32 start = rtw_get_current_time();
|
||||
|
||||
DBG_871X("%s\n", __FUNCTION__);
|
||||
|
|
|
|||
|
|
@ -105,7 +105,6 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv)
|
|||
|
||||
spin_lock_init(&pstapriv->sta_hash_lock);
|
||||
|
||||
/* _rtw_init_queue(&pstapriv->asoc_q); */
|
||||
pstapriv->asoc_sta_count = 0;
|
||||
_rtw_init_queue(&pstapriv->sleep_q);
|
||||
_rtw_init_queue(&pstapriv->wakeup_q);
|
||||
|
|
@ -113,8 +112,7 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv)
|
|||
psta = (struct sta_info *)(pstapriv->pstainfo_buf);
|
||||
|
||||
|
||||
for(i = 0; i < NUM_STA; i++)
|
||||
{
|
||||
for(i = 0; i < NUM_STA; i++) {
|
||||
_rtw_init_stainfo(psta);
|
||||
|
||||
_rtw_init_listhead(&(pstapriv->sta_hash[i]));
|
||||
|
|
@ -184,8 +182,8 @@ 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 )
|
||||
{
|
||||
_irqL irqL;
|
||||
_list *plist, *phead;
|
||||
unsigned long irqL;
|
||||
struct list_head *plist, *phead;
|
||||
struct sta_info *psta = NULL;
|
||||
|
||||
;
|
||||
|
|
@ -221,8 +219,8 @@ void rtw_mfree_sta_priv_lock(struct sta_priv *pstapriv)
|
|||
|
||||
u32 _rtw_free_sta_priv(struct sta_priv *pstapriv)
|
||||
{
|
||||
_irqL irqL;
|
||||
_list *phead, *plist;
|
||||
unsigned long irqL;
|
||||
struct list_head *phead, *plist;
|
||||
struct sta_info *psta = NULL;
|
||||
struct recv_reorder_ctrl *preorder_ctrl;
|
||||
int index;
|
||||
|
|
@ -263,15 +261,14 @@ 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(struct sta_priv *pstapriv, u8 *hwaddr)
|
||||
{
|
||||
_irqL irqL, irqL2;
|
||||
unsigned long irqL, irqL2;
|
||||
uint tmp_aid;
|
||||
s32 index;
|
||||
_list *phash_list;
|
||||
struct list_head *phash_list;
|
||||
struct sta_info *psta;
|
||||
_queue *pfree_sta_queue;
|
||||
struct __queue *pfree_sta_queue;
|
||||
struct recv_reorder_ctrl *preorder_ctrl;
|
||||
int i = 0;
|
||||
u16 wRxSeqInitialValue = 0xffff;
|
||||
|
|
@ -362,8 +359,8 @@ exit:
|
|||
u32 rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta)
|
||||
{
|
||||
int i;
|
||||
_irqL irqL0;
|
||||
_queue *pfree_sta_queue;
|
||||
unsigned long irqL0;
|
||||
struct __queue *pfree_sta_queue;
|
||||
struct recv_reorder_ctrl *preorder_ctrl;
|
||||
struct sta_xmit_priv *pstaxmitpriv;
|
||||
struct xmit_priv *pxmitpriv= &padapter->xmitpriv;
|
||||
|
|
@ -386,10 +383,6 @@ u32 rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta)
|
|||
|
||||
pstaxmitpriv = &psta->sta_xmitpriv;
|
||||
|
||||
/* rtw_list_delete(&psta->sleep_list); */
|
||||
|
||||
/* rtw_list_delete(&psta->wakeup_list); */
|
||||
|
||||
spin_lock_bh(&pxmitpriv->lock);
|
||||
|
||||
rtw_free_xmitframe_queue(pxmitpriv, &psta->sleep_q);
|
||||
|
|
@ -441,11 +434,11 @@ u32 rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta)
|
|||
/* for A-MPDU Rx reordering buffer control, cancel reordering_ctrl_timer */
|
||||
for(i=0; i < 16 ; i++)
|
||||
{
|
||||
_irqL irqL;
|
||||
_list *phead, *plist;
|
||||
unsigned long irqL;
|
||||
struct list_head *phead, *plist;
|
||||
union recv_frame *prframe;
|
||||
_queue *ppending_recvframe_queue;
|
||||
_queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue;
|
||||
struct __queue *ppending_recvframe_queue;
|
||||
struct __queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue;
|
||||
|
||||
preorder_ctrl = &psta->recvreorder_ctrl[i];
|
||||
|
||||
|
|
@ -521,8 +514,8 @@ exit:
|
|||
/* free all stainfo which in sta_hash[all] */
|
||||
void rtw_free_all_stainfo(struct adapter *padapter)
|
||||
{
|
||||
_irqL irqL;
|
||||
_list *plist, *phead;
|
||||
unsigned long irqL;
|
||||
struct list_head *plist, *phead;
|
||||
s32 index;
|
||||
struct sta_info *psta = NULL;
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
|
|
@ -564,9 +557,9 @@ exit:
|
|||
struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
|
||||
{
|
||||
|
||||
_irqL irqL;
|
||||
unsigned long irqL;
|
||||
|
||||
_list *plist, *phead;
|
||||
struct list_head *plist, *phead;
|
||||
|
||||
struct sta_info *psta = NULL;
|
||||
|
||||
|
|
@ -626,7 +619,6 @@ u32 rtw_init_bcmc_stainfo(struct adapter* padapter)
|
|||
u8 bcast_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff};
|
||||
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
/* _queue *pstapending = &padapter->xmitpriv.bm_pending; */
|
||||
|
||||
;
|
||||
|
||||
|
|
@ -659,13 +651,13 @@ u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr)
|
|||
{
|
||||
u8 res = true;
|
||||
#ifdef CONFIG_AP_MODE
|
||||
_irqL irqL;
|
||||
_list *plist, *phead;
|
||||
unsigned long irqL;
|
||||
struct list_head *plist, *phead;
|
||||
struct rtw_wlan_acl_node *paclnode;
|
||||
u8 match = false;
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
|
||||
_queue *pacl_node_q =&pacl_list->acl_node_q;
|
||||
struct __queue *pacl_node_q =&pacl_list->acl_node_q;
|
||||
|
||||
spin_lock_bh(&(pacl_node_q->lock));
|
||||
phead = get_list_head(pacl_node_q);
|
||||
|
|
|
|||
|
|
@ -594,7 +594,7 @@ static void set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib)
|
|||
pattrib->subtype = WIFI_QOS_DATA_TYPE;
|
||||
}
|
||||
|
||||
static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib *pattrib)
|
||||
static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct pkt_attrib *pattrib)
|
||||
{
|
||||
uint i;
|
||||
struct pkt_file pktfile;
|
||||
|
|
@ -1260,7 +1260,7 @@ This sub-routine will perform all the following:
|
|||
6. apply sw-encrypt, if necessary.
|
||||
|
||||
*/
|
||||
s32 rtw_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe)
|
||||
s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct xmit_frame *pxmitframe)
|
||||
{
|
||||
struct pkt_file pktfile;
|
||||
|
||||
|
|
@ -1459,7 +1459,7 @@ exit:
|
|||
|
||||
#ifdef CONFIG_IEEE80211W
|
||||
/* broadcast or multicast management pkt use BIP, unicast management pkt use CCMP encryption */
|
||||
s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe)
|
||||
s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct xmit_frame *pxmitframe)
|
||||
{
|
||||
struct pkt_file pktfile;
|
||||
s32 frg_inx, frg_len, mpdu_len, llc_sz, mem_sz;
|
||||
|
|
@ -1798,8 +1798,8 @@ void rtw_count_tx_stats(struct adapter *padapter, struct xmit_frame *pxmitframe,
|
|||
struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv)
|
||||
{
|
||||
struct xmit_buf *pxmitbuf = NULL;
|
||||
_list *plist, *phead;
|
||||
_queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue;
|
||||
struct list_head *plist, *phead;
|
||||
struct __queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue;
|
||||
unsigned long flags;
|
||||
|
||||
spin_lock_irqsave(&pfree_queue->lock, flags);
|
||||
|
|
@ -1842,7 +1842,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)
|
||||
{
|
||||
_queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue;
|
||||
struct __queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue;
|
||||
unsigned long flags;
|
||||
|
||||
if(pxmitbuf==NULL)
|
||||
|
|
@ -1866,8 +1866,8 @@ 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 *pxmitbuf = NULL;
|
||||
_list *plist, *phead;
|
||||
_queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue;
|
||||
struct list_head *plist, *phead;
|
||||
struct __queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue;
|
||||
unsigned long flags;
|
||||
|
||||
;
|
||||
|
|
@ -1918,7 +1918,7 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv)
|
|||
|
||||
s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
|
||||
{
|
||||
_queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue;
|
||||
struct __queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue;
|
||||
unsigned long flags;
|
||||
|
||||
if(pxmitbuf==NULL)
|
||||
|
|
@ -1991,8 +1991,8 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)/* _queue *pf
|
|||
*/
|
||||
|
||||
struct xmit_frame *pxframe = NULL;
|
||||
_list *plist, *phead;
|
||||
_queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue;
|
||||
struct list_head *plist, *phead;
|
||||
struct __queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue;
|
||||
struct adapter *padapter = pxmitpriv->adapter;
|
||||
|
||||
;
|
||||
|
|
@ -2026,8 +2026,8 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)/* _queue *pf
|
|||
struct xmit_frame *rtw_alloc_xmitframe_ext(struct xmit_priv *pxmitpriv)
|
||||
{
|
||||
struct xmit_frame *pxframe = NULL;
|
||||
_list *plist, *phead;
|
||||
_queue *queue = &pxmitpriv->free_xframe_ext_queue;
|
||||
struct list_head *plist, *phead;
|
||||
struct __queue *queue = &pxmitpriv->free_xframe_ext_queue;
|
||||
|
||||
;
|
||||
|
||||
|
|
@ -2086,9 +2086,9 @@ exit:
|
|||
|
||||
s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframe)
|
||||
{
|
||||
_queue *queue;
|
||||
struct __queue *queue;
|
||||
struct adapter *padapter = pxmitpriv->adapter;
|
||||
_pkt *pndis_pkt = NULL;
|
||||
struct sk_buff *pndis_pkt = NULL;
|
||||
|
||||
;
|
||||
|
||||
|
|
@ -2142,9 +2142,9 @@ exit:
|
|||
return _SUCCESS;
|
||||
}
|
||||
|
||||
void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, _queue *pframequeue)
|
||||
void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pframequeue)
|
||||
{
|
||||
_list *plist, *phead;
|
||||
struct list_head *plist, *phead;
|
||||
struct xmit_frame *pxmitframe;
|
||||
|
||||
;
|
||||
|
|
@ -2182,9 +2182,9 @@ s32 rtw_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitfram
|
|||
return _SUCCESS;
|
||||
}
|
||||
|
||||
static struct xmit_frame *dequeue_one_xmitframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit, struct tx_servq *ptxservq, _queue *pframe_queue)
|
||||
static struct xmit_frame *dequeue_one_xmitframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit, struct tx_servq *ptxservq, struct __queue *pframe_queue)
|
||||
{
|
||||
_list *xmitframe_plist, *xmitframe_phead;
|
||||
struct list_head *xmitframe_plist, *xmitframe_phead;
|
||||
struct xmit_frame *pxmitframe=NULL;
|
||||
|
||||
xmitframe_phead = get_list_head(pframe_queue);
|
||||
|
|
@ -2207,10 +2207,10 @@ static struct xmit_frame *dequeue_one_xmitframe(struct xmit_priv *pxmitpriv, str
|
|||
|
||||
struct xmit_frame* rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit_i, sint entry)
|
||||
{
|
||||
_list *sta_plist, *sta_phead;
|
||||
struct list_head *sta_plist, *sta_phead;
|
||||
struct hw_xmit *phwxmit;
|
||||
struct tx_servq *ptxservq = NULL;
|
||||
_queue *pframe_queue = NULL;
|
||||
struct __queue *pframe_queue = NULL;
|
||||
struct xmit_frame *pxmitframe = NULL;
|
||||
struct adapter *padapter = pxmitpriv->adapter;
|
||||
struct registry_priv *pregpriv = &padapter->registrypriv;
|
||||
|
|
@ -2661,7 +2661,7 @@ static void do_queue_select(struct adapter *padapter, struct pkt_attrib *pattrib
|
|||
* 0 success, hardware will handle this xmit frame(packet)
|
||||
* <0 fail
|
||||
*/
|
||||
s32 rtw_xmit(struct adapter *padapter, _pkt **ppkt)
|
||||
s32 rtw_xmit(struct adapter *padapter, struct sk_buff **ppkt)
|
||||
{
|
||||
static u32 start = 0;
|
||||
static u32 drop_cnt = 0;
|
||||
|
|
@ -2895,10 +2895,10 @@ sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fr
|
|||
|
||||
}
|
||||
|
||||
static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struct sta_info *psta, _queue *pframequeue)
|
||||
static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struct sta_info *psta, struct __queue *pframequeue)
|
||||
{
|
||||
sint ret;
|
||||
_list *plist, *phead;
|
||||
struct list_head *plist, *phead;
|
||||
u8 ac_index;
|
||||
struct tx_servq *ptxservq;
|
||||
struct pkt_attrib *pattrib;
|
||||
|
|
@ -2981,7 +2981,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta)
|
|||
{
|
||||
u8 update_mask=0, wmmps_ac=0;
|
||||
struct sta_info *psta_bmc;
|
||||
_list *xmitframe_plist, *xmitframe_phead;
|
||||
struct list_head *xmitframe_plist, *xmitframe_phead;
|
||||
struct xmit_frame *pxmitframe=NULL;
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
|
||||
|
|
@ -3147,7 +3147,7 @@ _exit:
|
|||
void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *psta)
|
||||
{
|
||||
u8 wmmps_ac=0;
|
||||
_list *xmitframe_plist, *xmitframe_phead;
|
||||
struct list_head *xmitframe_plist, *xmitframe_phead;
|
||||
struct xmit_frame *pxmitframe=NULL;
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue