mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-05-06 05:23:06 +00:00
rtl8188eu: Convert typedef for _queue to struct __queue
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
parent
e76fb1a97d
commit
689d01adf6
20 changed files with 125 additions and 208 deletions
|
|
@ -1212,7 +1212,7 @@ int rtw_acl_add_sta(_adapter *padapter, u8 *addr)
|
|||
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_88E("%s(acl_num=%d)=%pM\n", __func__, pacl_list->num, (addr));
|
||||
|
||||
|
|
@ -1285,7 +1285,7 @@ int rtw_acl_remove_sta(_adapter *padapter, u8 *addr)
|
|||
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_88E("%s(acl_num=%d)=%pM\n", __func__, pacl_list->num, (addr));
|
||||
|
||||
|
|
@ -2157,7 +2157,7 @@ void stop_ap_mode(_adapter *padapter)
|
|||
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;
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@ ISR/Call-Back functions can't call this sub-function.
|
|||
|
||||
*/
|
||||
|
||||
sint _rtw_enqueue_cmd(_queue *queue, struct cmd_obj *obj)
|
||||
sint _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj)
|
||||
{
|
||||
unsigned long irqL;
|
||||
|
||||
|
|
@ -178,7 +178,7 @@ _func_exit_;
|
|||
return _SUCCESS;
|
||||
}
|
||||
|
||||
struct cmd_obj *_rtw_dequeue_cmd(_queue *queue)
|
||||
struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue)
|
||||
{
|
||||
unsigned long irqL;
|
||||
struct cmd_obj *obj;
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ u8 rtw_do_join(_adapter * padapter)
|
|||
_list *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;
|
||||
|
||||
_func_enter_;
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ _func_enter_;
|
|||
_func_exit_;
|
||||
}
|
||||
|
||||
sint _rtw_enqueue_network(_queue *queue, struct wlan_network *pnetwork)
|
||||
sint _rtw_enqueue_network(struct __queue *queue, struct wlan_network *pnetwork)
|
||||
{
|
||||
unsigned long irqL;
|
||||
|
||||
|
|
@ -170,7 +170,7 @@ _func_exit_;
|
|||
return _SUCCESS;
|
||||
}
|
||||
|
||||
struct wlan_network *_rtw_dequeue_network(_queue *queue)
|
||||
struct wlan_network *_rtw_dequeue_network(struct __queue *queue)
|
||||
{
|
||||
unsigned long irqL;
|
||||
|
||||
|
|
@ -202,7 +202,7 @@ struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv )/* _queue *
|
|||
{
|
||||
unsigned long irqL;
|
||||
struct wlan_network *pnetwork;
|
||||
_queue *free_queue = &pmlmepriv->free_bss_pool;
|
||||
struct __queue *free_queue = &pmlmepriv->free_bss_pool;
|
||||
_list* plist = NULL;
|
||||
|
||||
_func_enter_;
|
||||
|
|
@ -241,7 +241,7 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv ,struct wlan_network *pnetwor
|
|||
u32 curr_time, delta_time;
|
||||
u32 lifetime = SCANQUEUE_LIFETIME;
|
||||
unsigned long irqL;
|
||||
_queue *free_queue = &(pmlmepriv->free_bss_pool);
|
||||
struct __queue *free_queue = &(pmlmepriv->free_bss_pool);
|
||||
|
||||
_func_enter_;
|
||||
|
||||
|
|
@ -284,7 +284,7 @@ _func_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);
|
||||
|
||||
_func_enter_;
|
||||
|
||||
|
|
@ -314,7 +314,7 @@ _func_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)
|
||||
{
|
||||
|
||||
_list *phead, *plist;
|
||||
|
|
@ -359,7 +359,7 @@ void _rtw_free_network_queue(_adapter *padapter, u8 isfreeall)
|
|||
_list *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;
|
||||
|
||||
_func_enter_;
|
||||
|
||||
|
|
@ -467,8 +467,8 @@ _func_enter_;
|
|||
_func_exit_;
|
||||
}
|
||||
|
||||
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 rtw_enqueue_network(struct __queue *queue, struct wlan_network *pnetwork)
|
||||
{
|
||||
int res;
|
||||
_func_enter_;
|
||||
|
|
@ -478,7 +478,7 @@ _func_exit_;
|
|||
}
|
||||
|
||||
|
||||
static struct wlan_network *rtw_dequeue_network(_queue *queue)
|
||||
static struct wlan_network *rtw_dequeue_network(struct __queue *queue)
|
||||
{
|
||||
struct wlan_network *pnetwork;
|
||||
_func_enter_;
|
||||
|
|
@ -497,8 +497,7 @@ _func_exit_;
|
|||
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) */
|
||||
void rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 is_freeall)
|
||||
{
|
||||
_func_enter_;
|
||||
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_network==> ssid = %s\n\n" , pnetwork->network.Ssid.Ssid));
|
||||
|
|
@ -528,7 +527,7 @@ _func_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)
|
||||
{
|
||||
struct wlan_network *pnetwork = _rtw_find_network(scanned_queue, addr);
|
||||
|
||||
|
|
@ -591,7 +590,7 @@ _func_exit_;
|
|||
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
|
|
@ -722,7 +721,7 @@ void rtw_update_scanned_network(_adapter *adapter, struct wlan_bssid_ex *target)
|
|||
_list *plist, *phead;
|
||||
ULONG bssid_ex_sz;
|
||||
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
|
||||
_queue *queue = &(pmlmepriv->scanned_queue);
|
||||
struct __queue *queue = &(pmlmepriv->scanned_queue);
|
||||
struct wlan_network *pnetwork = NULL;
|
||||
struct wlan_network *oldest = NULL;
|
||||
|
||||
|
|
@ -1104,8 +1103,8 @@ void rtw_fwdbg_event_callback(_adapter *adapter , u8 *pbuf)
|
|||
static void free_scanqueue(struct mlme_priv *pmlmepriv)
|
||||
{
|
||||
unsigned long irqL, irqL0;
|
||||
_queue *free_queue = &pmlmepriv->free_bss_pool;
|
||||
_queue *scan_queue = &pmlmepriv->scanned_queue;
|
||||
struct __queue *free_queue = &pmlmepriv->free_bss_pool;
|
||||
struct __queue *scan_queue = &pmlmepriv->scanned_queue;
|
||||
_list *plist, *phead, *ptemp;
|
||||
|
||||
_func_enter_;
|
||||
|
|
@ -2108,7 +2107,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv )
|
|||
int ret;
|
||||
_list *phead;
|
||||
_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;
|
||||
|
|
|
|||
|
|
@ -6997,7 +6997,7 @@ static void issue_action_BSSCoexistPacket(_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];
|
||||
#ifdef CONFIG_80211N_HT
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ _func_exit_;
|
|||
|
||||
}
|
||||
|
||||
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;
|
||||
|
|
@ -180,7 +180,7 @@ _func_exit_;
|
|||
|
||||
}
|
||||
|
||||
union recv_frame *rtw_alloc_recvframe (_queue *pfree_recv_queue)
|
||||
union recv_frame *rtw_alloc_recvframe (struct __queue *pfree_recv_queue)
|
||||
{
|
||||
unsigned long irqL;
|
||||
union recv_frame *precvframe;
|
||||
|
|
@ -202,7 +202,7 @@ 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)
|
||||
{
|
||||
unsigned long irqL;
|
||||
_adapter *padapter=precvframe->u.hdr.adapter;
|
||||
|
|
@ -239,7 +239,7 @@ _func_exit_;
|
|||
|
||||
|
||||
|
||||
sint _rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue)
|
||||
sint _rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *queue)
|
||||
{
|
||||
|
||||
_adapter *padapter=precvframe->u.hdr.adapter;
|
||||
|
|
@ -263,7 +263,7 @@ _func_exit_;
|
|||
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;
|
||||
unsigned long irqL;
|
||||
|
|
@ -275,16 +275,6 @@ sint rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue)
|
|||
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,7 +283,7 @@ 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;
|
||||
|
|
@ -333,7 +323,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, struct __queue *queue)
|
||||
{
|
||||
unsigned long irqL;
|
||||
|
||||
|
|
@ -347,7 +337,7 @@ 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)
|
||||
{
|
||||
unsigned long irqL;
|
||||
_enter_critical_ex(&queue->lock, &irqL);
|
||||
|
|
@ -359,7 +349,7 @@ sint rtw_enqueue_recvbuf(struct recv_buf *precvbuf, _queue *queue)
|
|||
return _SUCCESS;
|
||||
}
|
||||
|
||||
struct recv_buf *rtw_dequeue_recvbuf (_queue *queue)
|
||||
struct recv_buf *rtw_dequeue_recvbuf (struct __queue *queue)
|
||||
{
|
||||
unsigned long irqL;
|
||||
struct recv_buf *precvbuf;
|
||||
|
|
@ -1846,14 +1836,14 @@ _func_exit_;
|
|||
#endif
|
||||
|
||||
/* perform defrag */
|
||||
union recv_frame *recvframe_defrag(_adapter *adapter, _queue *defrag_q)
|
||||
union recv_frame *recvframe_defrag(_adapter *adapter, struct __queue *defrag_q)
|
||||
{
|
||||
_list *plist, *phead;
|
||||
u8 wlanhdr_offset;
|
||||
u8 curfragnum;
|
||||
struct recv_frame_hdr *pfhdr,*pnfhdr;
|
||||
union recv_frame* prframe, *pnextrframe;
|
||||
_queue *pfree_recv_queue;
|
||||
struct __queue *pfree_recv_queue;
|
||||
|
||||
_func_enter_;
|
||||
|
||||
|
|
@ -1943,7 +1933,7 @@ union recv_frame* recvframe_chk_defrag(PADAPTER padapter, union recv_frame *prec
|
|||
struct sta_priv *pstapriv;
|
||||
_list *phead;
|
||||
union recv_frame *prtnframe = NULL;
|
||||
_queue *pfree_recv_queue, *pdefrag_q;
|
||||
struct __queue *pfree_recv_queue, *pdefrag_q;
|
||||
|
||||
_func_enter_;
|
||||
|
||||
|
|
@ -2066,7 +2056,7 @@ static int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
|
|||
unsigned char *data_ptr;
|
||||
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;
|
||||
|
||||
|
|
@ -2222,7 +2212,7 @@ 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;
|
||||
struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
|
||||
_list *phead, *plist;
|
||||
union recv_frame *pnextrframe;
|
||||
struct rx_pkt_attrib *pnextattrib;
|
||||
|
|
@ -2255,7 +2245,7 @@ static int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ct
|
|||
struct rx_pkt_attrib *pattrib;
|
||||
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;
|
||||
|
||||
phead = get_list_head(ppending_recvframe_queue);
|
||||
plist = get_next(phead);
|
||||
|
|
@ -2332,7 +2322,7 @@ static int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prfram
|
|||
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)
|
||||
{
|
||||
|
|
@ -2443,7 +2433,7 @@ void rtw_reordering_ctrl_timeout_handler(void *pcontext)
|
|||
unsigned long irql;
|
||||
struct recv_reorder_ctrl *preorder_ctrl = (struct recv_reorder_ctrl *)pcontext;
|
||||
_adapter *padapter = preorder_ctrl->padapter;
|
||||
_queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
|
||||
struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
|
||||
|
||||
|
||||
if (padapter->bDriverStopped ||padapter->bSurpriseRemoved)
|
||||
|
|
@ -2528,7 +2518,7 @@ static int recv_func_prehandle(_adapter *padapter, union recv_frame *rframe)
|
|||
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;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
|
||||
if (padapter->registrypriv.mp_mode == 1)
|
||||
|
|
@ -2568,7 +2558,7 @@ static int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
|
|||
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);
|
||||
|
|
|
|||
|
|
@ -95,7 +95,6 @@ _func_enter_;
|
|||
|
||||
_rtw_spinlock_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);
|
||||
|
|
@ -103,8 +102,7 @@ _func_enter_;
|
|||
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]));
|
||||
|
|
@ -269,14 +267,12 @@ _func_enter_;
|
|||
phead = &(pstapriv->sta_hash[index]);
|
||||
plist = get_next(phead);
|
||||
|
||||
while ((rtw_end_of_queue_search(phead, plist)) == false)
|
||||
{
|
||||
while ((rtw_end_of_queue_search(phead, plist)) == false) {
|
||||
int i;
|
||||
psta = LIST_CONTAINOR(plist, struct sta_info ,hash_list);
|
||||
plist = get_next(plist);
|
||||
|
||||
for (i=0; i < 16 ; i++)
|
||||
{
|
||||
for (i=0; i < 16; i++) {
|
||||
preorder_ctrl = &psta->recvreorder_ctrl[i];
|
||||
_cancel_timer_ex(&preorder_ctrl->reordering_ctrl_timer);
|
||||
}
|
||||
|
|
@ -302,7 +298,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
|
|||
s32 index;
|
||||
_list *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;
|
||||
|
|
@ -396,7 +392,7 @@ u32 rtw_free_stainfo(_adapter *padapter , struct sta_info *psta)
|
|||
{
|
||||
int i;
|
||||
unsigned long irqL0;
|
||||
_queue *pfree_sta_queue;
|
||||
struct __queue *pfree_sta_queue;
|
||||
struct recv_reorder_ctrl *preorder_ctrl;
|
||||
struct sta_xmit_priv *pstaxmitpriv;
|
||||
struct xmit_priv *pxmitpriv= &padapter->xmitpriv;
|
||||
|
|
@ -413,56 +409,33 @@ _func_enter_;
|
|||
|
||||
pstaxmitpriv = &psta->sta_xmitpriv;
|
||||
|
||||
/* rtw_list_delete(&psta->sleep_list); */
|
||||
|
||||
/* rtw_list_delete(&psta->wakeup_list); */
|
||||
|
||||
_enter_critical_bh(&pxmitpriv->lock, &irqL0);
|
||||
|
||||
rtw_free_xmitframe_queue(pxmitpriv, &psta->sleep_q);
|
||||
psta->sleepq_len = 0;
|
||||
|
||||
/* _enter_critical_bh(&(pxmitpriv->vo_pending.lock), &irqL0); */
|
||||
|
||||
rtw_free_xmitframe_queue( pxmitpriv, &pstaxmitpriv->vo_q.sta_pending);
|
||||
|
||||
rtw_list_delete(&(pstaxmitpriv->vo_q.tx_pending));
|
||||
|
||||
/* _exit_critical_bh(&(pxmitpriv->vo_pending.lock), &irqL0); */
|
||||
|
||||
|
||||
/* _enter_critical_bh(&(pxmitpriv->vi_pending.lock), &irqL0); */
|
||||
|
||||
rtw_free_xmitframe_queue( pxmitpriv, &pstaxmitpriv->vi_q.sta_pending);
|
||||
|
||||
rtw_list_delete(&(pstaxmitpriv->vi_q.tx_pending));
|
||||
|
||||
/* _exit_critical_bh(&(pxmitpriv->vi_pending.lock), &irqL0); */
|
||||
|
||||
|
||||
/* _enter_critical_bh(&(pxmitpriv->bk_pending.lock), &irqL0); */
|
||||
|
||||
rtw_free_xmitframe_queue( pxmitpriv, &pstaxmitpriv->bk_q.sta_pending);
|
||||
|
||||
rtw_list_delete(&(pstaxmitpriv->bk_q.tx_pending));
|
||||
|
||||
/* _exit_critical_bh(&(pxmitpriv->bk_pending.lock), &irqL0); */
|
||||
|
||||
/* _enter_critical_bh(&(pxmitpriv->be_pending.lock), &irqL0); */
|
||||
|
||||
rtw_free_xmitframe_queue( pxmitpriv, &pstaxmitpriv->be_q.sta_pending);
|
||||
|
||||
rtw_list_delete(&(pstaxmitpriv->be_q.tx_pending));
|
||||
|
||||
/* _exit_critical_bh(&(pxmitpriv->be_pending.lock), &irqL0); */
|
||||
|
||||
_exit_critical_bh(&pxmitpriv->lock, &irqL0);
|
||||
|
||||
rtw_list_delete(&psta->hash_list);
|
||||
RT_TRACE(_module_rtl871x_sta_mgt_c_,_drv_err_,("\n free number_%d stainfo with hwaddr = 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x\n",pstapriv->asoc_sta_count , psta->hwaddr[0], psta->hwaddr[1], psta->hwaddr[2],psta->hwaddr[3],psta->hwaddr[4],psta->hwaddr[5]));
|
||||
pstapriv->asoc_sta_count --;
|
||||
|
||||
|
||||
/* re-init sta_info; 20061114 */
|
||||
_rtw_init_sta_xmit_priv(&psta->sta_xmitpriv);
|
||||
_rtw_init_sta_recv_priv(&psta->sta_recvpriv);
|
||||
|
|
@ -475,8 +448,8 @@ _func_enter_;
|
|||
unsigned long irqL;
|
||||
_list *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];
|
||||
|
||||
|
|
@ -657,13 +630,10 @@ _func_exit_;
|
|||
|
||||
u32 rtw_init_bcmc_stainfo(_adapter* padapter)
|
||||
{
|
||||
|
||||
struct sta_info *psta;
|
||||
u32 res=_SUCCESS;
|
||||
unsigned char bcast_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff};
|
||||
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
/* _queue *pstapending = &padapter->xmitpriv.bm_pending; */
|
||||
|
||||
_func_enter_;
|
||||
|
||||
|
|
@ -705,7 +675,7 @@ u8 rtw_access_ctrl(_adapter *padapter, u8 *mac_addr)
|
|||
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;
|
||||
|
||||
_enter_critical_bh(&(pacl_node_q->lock), &irqL);
|
||||
phead = get_list_head(pacl_node_q);
|
||||
|
|
|
|||
|
|
@ -89,21 +89,14 @@ _func_enter_;
|
|||
|
||||
pxmitpriv->adapter = padapter;
|
||||
|
||||
/* for (i = 0 ; i < MAX_NUMBLKS; i++) */
|
||||
/* _rtw_init_queue(&pxmitpriv->blk_strms[i]); */
|
||||
|
||||
_rtw_init_queue(&pxmitpriv->be_pending);
|
||||
_rtw_init_queue(&pxmitpriv->bk_pending);
|
||||
_rtw_init_queue(&pxmitpriv->vi_pending);
|
||||
_rtw_init_queue(&pxmitpriv->vo_pending);
|
||||
_rtw_init_queue(&pxmitpriv->bm_pending);
|
||||
|
||||
/* _rtw_init_queue(&pxmitpriv->legacy_dz_queue); */
|
||||
/* _rtw_init_queue(&pxmitpriv->apsd_queue); */
|
||||
|
||||
_rtw_init_queue(&pxmitpriv->free_xmit_queue);
|
||||
|
||||
|
||||
/*
|
||||
Please allocate memory with the sz = (struct xmit_frame) * NR_XMITFRAME,
|
||||
and initialize free_xmit_frame below.
|
||||
|
|
@ -263,7 +256,6 @@ _func_exit_;
|
|||
return res;
|
||||
}
|
||||
|
||||
void rtw_mfree_xmit_priv_lock (struct xmit_priv *pxmitpriv);
|
||||
void rtw_mfree_xmit_priv_lock (struct xmit_priv *pxmitpriv)
|
||||
{
|
||||
_rtw_spinlock_free(&pxmitpriv->lock);
|
||||
|
|
@ -276,9 +268,6 @@ void rtw_mfree_xmit_priv_lock (struct xmit_priv *pxmitpriv)
|
|||
_rtw_spinlock_free(&pxmitpriv->vo_pending.lock);
|
||||
_rtw_spinlock_free(&pxmitpriv->bm_pending.lock);
|
||||
|
||||
/* _rtw_spinlock_free(&pxmitpriv->legacy_dz_queue.lock); */
|
||||
/* _rtw_spinlock_free(&pxmitpriv->apsd_queue.lock); */
|
||||
|
||||
_rtw_spinlock_free(&pxmitpriv->free_xmit_queue.lock);
|
||||
_rtw_spinlock_free(&pxmitpriv->free_xmitbuf_queue.lock);
|
||||
_rtw_spinlock_free(&pxmitpriv->pending_xmitbuf_queue.lock);
|
||||
|
|
@ -1450,7 +1439,7 @@ struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv)
|
|||
unsigned long irqL;
|
||||
struct xmit_buf *pxmitbuf = NULL;
|
||||
_list *plist, *phead;
|
||||
_queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue;
|
||||
struct __queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue;
|
||||
|
||||
_func_enter_;
|
||||
|
||||
|
|
@ -1493,7 +1482,7 @@ _func_exit_;
|
|||
s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
|
||||
{
|
||||
unsigned long irqL;
|
||||
_queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue;
|
||||
struct __queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue;
|
||||
|
||||
_func_enter_;
|
||||
|
||||
|
|
@ -1521,7 +1510,7 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv)
|
|||
unsigned long irqL;
|
||||
struct xmit_buf *pxmitbuf = NULL;
|
||||
_list *plist, *phead;
|
||||
_queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue;
|
||||
struct __queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue;
|
||||
|
||||
_func_enter_;
|
||||
|
||||
|
|
@ -1561,7 +1550,7 @@ _func_exit_;
|
|||
s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
|
||||
{
|
||||
unsigned long irqL;
|
||||
_queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue;
|
||||
struct __queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue;
|
||||
|
||||
_func_enter_;
|
||||
|
||||
|
|
@ -1622,7 +1611,7 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)/* _queue *pf
|
|||
unsigned long irqL;
|
||||
struct xmit_frame *pxframe = NULL;
|
||||
_list *plist, *phead;
|
||||
_queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue;
|
||||
struct __queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue;
|
||||
_adapter *padapter = pxmitpriv->adapter;
|
||||
|
||||
_func_enter_;
|
||||
|
|
@ -1673,7 +1662,7 @@ _func_exit_;
|
|||
s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframe)
|
||||
{
|
||||
unsigned long irqL;
|
||||
_queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue;
|
||||
struct __queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue;
|
||||
_adapter *padapter = pxmitpriv->adapter;
|
||||
struct sk_buff *pndis_pkt = NULL;
|
||||
|
||||
|
|
@ -1711,7 +1700,7 @@ _func_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)
|
||||
{
|
||||
unsigned long irqL;
|
||||
_list *plist, *phead;
|
||||
|
|
@ -1752,7 +1741,7 @@ s32 rtw_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe)
|
|||
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 xmit_frame *pxmitframe=NULL;
|
||||
|
|
@ -1785,7 +1774,7 @@ struct xmit_frame* rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmi
|
|||
_list *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;
|
||||
_adapter *padapter = pxmitpriv->adapter;
|
||||
struct registry_priv *pregpriv = &padapter->registrypriv;
|
||||
|
|
@ -1809,8 +1798,6 @@ _func_enter_;
|
|||
{
|
||||
phwxmit = phwxmit_i + inx[i];
|
||||
|
||||
/* _enter_critical_ex(&phwxmit->sta_queue->lock, &irqL0); */
|
||||
|
||||
sta_phead = get_list_head(phwxmit->sta_queue);
|
||||
sta_plist = get_next(sta_phead);
|
||||
|
||||
|
|
@ -1830,26 +1817,16 @@ _func_enter_;
|
|||
/* Remove sta node when there is no pending packets. */
|
||||
if (_rtw_queue_empty(pframe_queue)) /* must be done after get_next and before break */
|
||||
rtw_list_delete(&ptxservq->tx_pending);
|
||||
|
||||
/* _exit_critical_ex(&phwxmit->sta_queue->lock, &irqL0); */
|
||||
|
||||
goto exit;
|
||||
}
|
||||
|
||||
sta_plist = get_next(sta_plist);
|
||||
|
||||
}
|
||||
|
||||
/* _exit_critical_ex(&phwxmit->sta_queue->lock, &irqL0); */
|
||||
|
||||
}
|
||||
|
||||
exit:
|
||||
|
||||
_exit_critical_bh(&pxmitpriv->lock, &irqL0);
|
||||
|
||||
_func_exit_;
|
||||
|
||||
return pxmitframe;
|
||||
}
|
||||
|
||||
|
|
@ -1899,7 +1876,7 @@ _func_exit_;
|
|||
}
|
||||
#else
|
||||
__inline static struct tx_servq *rtw_get_sta_pending
|
||||
(_adapter *padapter, _queue **ppstapending, struct sta_info *psta, sint up)
|
||||
(_adapter *padapter, struct __queue **ppstapending, struct sta_info *psta, sint up)
|
||||
{
|
||||
struct tx_servq *ptxservq;
|
||||
struct hw_xmit *phwxmits = padapter->xmitpriv.hwxmits;
|
||||
|
|
@ -2489,7 +2466,7 @@ sint xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *p
|
|||
|
||||
}
|
||||
|
||||
static void dequeue_xmitframes_to_sleeping_queue(_adapter *padapter, struct sta_info *psta, _queue *pframequeue)
|
||||
static void dequeue_xmitframes_to_sleeping_queue(_adapter *padapter, struct sta_info *psta, struct __queue *pframequeue)
|
||||
{
|
||||
_list *plist, *phead;
|
||||
u8 ac_index;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue