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

rtl8188eu: Convert typedef for _queue to struct __queue

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-24 17:55:38 -05:00
parent e76fb1a97d
commit 689d01adf6
20 changed files with 125 additions and 208 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/rtw_ap.c
View file

@ -1212,7 +1212,7 @@ int rtw_acl_add_sta(_adapter *padapter, u8 *addr)
struct rtw_wlan_acl_node *paclnode; struct rtw_wlan_acl_node *paclnode;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; 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)); 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 rtw_wlan_acl_node *paclnode;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; 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)); 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_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; 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; pmlmepriv->update_bcn = false;
pmlmeext->bstart_bss = false; pmlmeext->bstart_bss = false;

4
core/rtw_cmd.c
View file

@ -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; unsigned long irqL;
@ -178,7 +178,7 @@ _func_exit_;
return _SUCCESS; return _SUCCESS;
} }
struct cmd_obj *_rtw_dequeue_cmd(_queue *queue) struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue)
{ {
unsigned long irqL; unsigned long irqL;
struct cmd_obj *obj; struct cmd_obj *obj;

2
core/rtw_ioctl_set.c
View file

@ -74,7 +74,7 @@ u8 rtw_do_join(_adapter * padapter)
_list *plist, *phead; _list *plist, *phead;
u8* pibss = NULL; u8* pibss = NULL;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
_queue *queue = &(pmlmepriv->scanned_queue); struct __queue *queue = &(pmlmepriv->scanned_queue);
u8 ret=_SUCCESS; u8 ret=_SUCCESS;
_func_enter_; _func_enter_;

35
core/rtw_mlme.c
View file

@ -148,7 +148,7 @@ _func_enter_;
_func_exit_; _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; unsigned long irqL;
@ -170,7 +170,7 @@ _func_exit_;
return _SUCCESS; return _SUCCESS;
} }
struct wlan_network *_rtw_dequeue_network(_queue *queue) struct wlan_network *_rtw_dequeue_network(struct __queue *queue)
{ {
unsigned long irqL; unsigned long irqL;
@ -202,7 +202,7 @@ struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv )/* _queue *
{ {
unsigned long irqL; unsigned long irqL;
struct wlan_network *pnetwork; struct wlan_network *pnetwork;
_queue *free_queue = &pmlmepriv->free_bss_pool; struct __queue *free_queue = &pmlmepriv->free_bss_pool;
_list* plist = NULL; _list* plist = NULL;
_func_enter_; _func_enter_;
@ -241,7 +241,7 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv ,struct wlan_network *pnetwor
u32 curr_time, delta_time; u32 curr_time, delta_time;
u32 lifetime = SCANQUEUE_LIFETIME; u32 lifetime = SCANQUEUE_LIFETIME;
unsigned long irqL; unsigned long irqL;
_queue *free_queue = &(pmlmepriv->free_bss_pool); struct __queue *free_queue = &(pmlmepriv->free_bss_pool);
_func_enter_; _func_enter_;
@ -284,7 +284,7 @@ _func_exit_;
void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork) 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_; _func_enter_;
@ -314,7 +314,7 @@ _func_exit_;
Shall be calle under atomic context... to avoid possible racing condition... 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; _list *phead, *plist;
@ -359,7 +359,7 @@ void _rtw_free_network_queue(_adapter *padapter, u8 isfreeall)
_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;
_queue *scanned_queue = &pmlmepriv->scanned_queue; struct __queue *scanned_queue = &pmlmepriv->scanned_queue;
_func_enter_; _func_enter_;
@ -467,8 +467,8 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
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(_queue *queue, struct wlan_network *pnetwork) int rtw_enqueue_network(struct __queue *queue, struct wlan_network *pnetwork)
{ {
int res; int res;
_func_enter_; _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; struct wlan_network *pnetwork;
_func_enter_; _func_enter_;
@ -497,8 +497,7 @@ _func_exit_;
return pnetwork; 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)
void rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 is_freeall)/* struct wlan_network *pnetwork, _queue *free_queue) */
{ {
_func_enter_; _func_enter_;
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_network==> ssid = %s\n\n" , pnetwork->network.Ssid.Ssid)); 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... 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); 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; _list *plist, *phead;
@ -722,7 +721,7 @@ void rtw_update_scanned_network(_adapter *adapter, struct wlan_bssid_ex *target)
_list *plist, *phead; _list *plist, *phead;
ULONG bssid_ex_sz; ULONG bssid_ex_sz;
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
_queue *queue = &(pmlmepriv->scanned_queue); struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
struct wlan_network *oldest = 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) static void free_scanqueue(struct mlme_priv *pmlmepriv)
{ {
unsigned long irqL, irqL0; unsigned long irqL, irqL0;
_queue *free_queue = &pmlmepriv->free_bss_pool; struct __queue *free_queue = &pmlmepriv->free_bss_pool;
_queue *scan_queue = &pmlmepriv->scanned_queue; struct __queue *scan_queue = &pmlmepriv->scanned_queue;
_list *plist, *phead, *ptemp; _list *plist, *phead, *ptemp;
_func_enter_; _func_enter_;
@ -2108,7 +2107,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv )
int ret; int ret;
_list *phead; _list *phead;
_adapter *adapter; _adapter *adapter;
_queue *queue = &(pmlmepriv->scanned_queue); struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
struct wlan_network *candidate = NULL; struct wlan_network *candidate = NULL;
u8 bSupportAntDiv = false; u8 bSupportAntDiv = false;

2
core/rtw_mlme_ext.c
View file

@ -6997,7 +6997,7 @@ static void issue_action_BSSCoexistPacket(_adapter *padapter)
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);
_queue *queue = &(pmlmepriv->scanned_queue); struct __queue *queue = &(pmlmepriv->scanned_queue);
u8 InfoContent[16] = {0}; u8 InfoContent[16] = {0};
u8 ICS[8][15]; u8 ICS[8][15];
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT

48
core/rtw_recv.c
View file

@ -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; 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; unsigned long irqL;
union recv_frame *precvframe; 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; 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; unsigned long irqL;
_adapter *padapter=precvframe->u.hdr.adapter; _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; _adapter *padapter=precvframe->u.hdr.adapter;
@ -263,7 +263,7 @@ _func_exit_;
return _SUCCESS; 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; sint ret;
unsigned long irqL; unsigned long irqL;
@ -275,16 +275,6 @@ sint rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue)
return ret; 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) caller : defrag ; recvframe_chk_defrag in recv_thread (passive)
pframequeue: defrag_queue : will be accessed 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; union recv_frame *precvframe;
_list *plist, *phead; _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; unsigned long irqL;
@ -347,7 +337,7 @@ sint rtw_enqueue_recvbuf_to_head(struct recv_buf *precvbuf, _queue *queue)
return _SUCCESS; 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; unsigned long irqL;
_enter_critical_ex(&queue->lock, &irqL); _enter_critical_ex(&queue->lock, &irqL);
@ -359,7 +349,7 @@ sint rtw_enqueue_recvbuf(struct recv_buf *precvbuf, _queue *queue)
return _SUCCESS; return _SUCCESS;
} }
struct recv_buf *rtw_dequeue_recvbuf (_queue *queue) struct recv_buf *rtw_dequeue_recvbuf (struct __queue *queue)
{ {
unsigned long irqL; unsigned long irqL;
struct recv_buf *precvbuf; struct recv_buf *precvbuf;
@ -1846,14 +1836,14 @@ _func_exit_;
#endif #endif
/* perform defrag */ /* 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; _list *plist, *phead;
u8 wlanhdr_offset; u8 wlanhdr_offset;
u8 curfragnum; u8 curfragnum;
struct recv_frame_hdr *pfhdr,*pnfhdr; struct recv_frame_hdr *pfhdr,*pnfhdr;
union recv_frame* prframe, *pnextrframe; union recv_frame* prframe, *pnextrframe;
_queue *pfree_recv_queue; struct __queue *pfree_recv_queue;
_func_enter_; _func_enter_;
@ -1943,7 +1933,7 @@ union recv_frame* recvframe_chk_defrag(PADAPTER padapter, union recv_frame *prec
struct sta_priv *pstapriv; struct sta_priv *pstapriv;
_list *phead; _list *phead;
union recv_frame *prtnframe = NULL; union recv_frame *prtnframe = NULL;
_queue *pfree_recv_queue, *pdefrag_q; struct __queue *pfree_recv_queue, *pdefrag_q;
_func_enter_; _func_enter_;
@ -2066,7 +2056,7 @@ static int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
unsigned char *data_ptr; unsigned char *data_ptr;
struct sk_buff *sub_skb,*subframes[MAX_SUBFRAME_COUNT]; struct sk_buff *sub_skb,*subframes[MAX_SUBFRAME_COUNT];
struct recv_priv *precvpriv = &padapter->recvpriv; 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; int ret = _SUCCESS;
nr_subframes = 0; 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) int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union recv_frame *prframe)
{ {
struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib; 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; _list *phead, *plist;
union recv_frame *pnextrframe; union recv_frame *pnextrframe;
struct rx_pkt_attrib *pnextattrib; 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; struct rx_pkt_attrib *pattrib;
int bPktInBuf = false; int bPktInBuf = false;
struct recv_priv *precvpriv = &padapter->recvpriv; 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); phead = get_list_head(ppending_recvframe_queue);
plist = get_next(phead); plist = get_next(phead);
@ -2332,7 +2322,7 @@ static int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prfram
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;
_queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue; struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
if (!pattrib->amsdu) if (!pattrib->amsdu)
{ {
@ -2443,7 +2433,7 @@ void rtw_reordering_ctrl_timeout_handler(void *pcontext)
unsigned long 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; struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
if (padapter->bDriverStopped ||padapter->bSurpriseRemoved) if (padapter->bDriverStopped ||padapter->bSurpriseRemoved)
@ -2528,7 +2518,7 @@ static int recv_func_prehandle(_adapter *padapter, union recv_frame *rframe)
int ret = _SUCCESS; int ret = _SUCCESS;
struct rx_pkt_attrib *pattrib = &rframe->u.hdr.attrib; struct rx_pkt_attrib *pattrib = &rframe->u.hdr.attrib;
struct recv_priv *precvpriv = &padapter->recvpriv; 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; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
if (padapter->registrypriv.mp_mode == 1) 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; union recv_frame *orig_prframe = prframe;
struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib; struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib;
struct recv_priv *precvpriv = &padapter->recvpriv; 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 */ /* DATA FRAME */
rtw_led_control(padapter, LED_CTL_RX); rtw_led_control(padapter, LED_CTL_RX);

46
core/rtw_sta_mgt.c
View file

@ -95,7 +95,6 @@ _func_enter_;
_rtw_spinlock_init(&pstapriv->sta_hash_lock); _rtw_spinlock_init(&pstapriv->sta_hash_lock);
/* _rtw_init_queue(&pstapriv->asoc_q); */
pstapriv->asoc_sta_count = 0; pstapriv->asoc_sta_count = 0;
_rtw_init_queue(&pstapriv->sleep_q); _rtw_init_queue(&pstapriv->sleep_q);
_rtw_init_queue(&pstapriv->wakeup_q); _rtw_init_queue(&pstapriv->wakeup_q);
@ -103,8 +102,7 @@ _func_enter_;
psta = (struct sta_info *)(pstapriv->pstainfo_buf); 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_stainfo(psta);
_rtw_init_listhead(&(pstapriv->sta_hash[i])); _rtw_init_listhead(&(pstapriv->sta_hash[i]));
@ -269,14 +267,12 @@ _func_enter_;
phead = &(pstapriv->sta_hash[index]); phead = &(pstapriv->sta_hash[index]);
plist = get_next(phead); plist = get_next(phead);
while ((rtw_end_of_queue_search(phead, plist)) == false) while ((rtw_end_of_queue_search(phead, plist)) == false) {
{
int i; int i;
psta = LIST_CONTAINOR(plist, struct sta_info ,hash_list); psta = LIST_CONTAINOR(plist, struct sta_info ,hash_list);
plist = get_next(plist); plist = get_next(plist);
for (i=0; i < 16 ; i++) for (i=0; i < 16; i++) {
{
preorder_ctrl = &psta->recvreorder_ctrl[i]; preorder_ctrl = &psta->recvreorder_ctrl[i];
_cancel_timer_ex(&preorder_ctrl->reordering_ctrl_timer); _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; s32 index;
_list *phash_list; _list *phash_list;
struct sta_info *psta; struct sta_info *psta;
_queue *pfree_sta_queue; struct __queue *pfree_sta_queue;
struct recv_reorder_ctrl *preorder_ctrl; struct recv_reorder_ctrl *preorder_ctrl;
int i = 0; int i = 0;
u16 wRxSeqInitialValue = 0xffff; u16 wRxSeqInitialValue = 0xffff;
@ -396,7 +392,7 @@ u32 rtw_free_stainfo(_adapter *padapter , struct sta_info *psta)
{ {
int i; int i;
unsigned long irqL0; unsigned long irqL0;
_queue *pfree_sta_queue; struct __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;
struct xmit_priv *pxmitpriv= &padapter->xmitpriv; struct xmit_priv *pxmitpriv= &padapter->xmitpriv;
@ -413,56 +409,33 @@ _func_enter_;
pstaxmitpriv = &psta->sta_xmitpriv; pstaxmitpriv = &psta->sta_xmitpriv;
/* rtw_list_delete(&psta->sleep_list); */
/* rtw_list_delete(&psta->wakeup_list); */
_enter_critical_bh(&pxmitpriv->lock, &irqL0); _enter_critical_bh(&pxmitpriv->lock, &irqL0);
rtw_free_xmitframe_queue(pxmitpriv, &psta->sleep_q); rtw_free_xmitframe_queue(pxmitpriv, &psta->sleep_q);
psta->sleepq_len = 0; psta->sleepq_len = 0;
/* _enter_critical_bh(&(pxmitpriv->vo_pending.lock), &irqL0); */
rtw_free_xmitframe_queue( pxmitpriv, &pstaxmitpriv->vo_q.sta_pending); rtw_free_xmitframe_queue( pxmitpriv, &pstaxmitpriv->vo_q.sta_pending);
rtw_list_delete(&(pstaxmitpriv->vo_q.tx_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_free_xmitframe_queue( pxmitpriv, &pstaxmitpriv->vi_q.sta_pending);
rtw_list_delete(&(pstaxmitpriv->vi_q.tx_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_free_xmitframe_queue( pxmitpriv, &pstaxmitpriv->bk_q.sta_pending);
rtw_list_delete(&(pstaxmitpriv->bk_q.tx_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_free_xmitframe_queue( pxmitpriv, &pstaxmitpriv->be_q.sta_pending);
rtw_list_delete(&(pstaxmitpriv->be_q.tx_pending)); rtw_list_delete(&(pstaxmitpriv->be_q.tx_pending));
/* _exit_critical_bh(&(pxmitpriv->be_pending.lock), &irqL0); */
_exit_critical_bh(&pxmitpriv->lock, &irqL0); _exit_critical_bh(&pxmitpriv->lock, &irqL0);
rtw_list_delete(&psta->hash_list); 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])); 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 --; pstapriv->asoc_sta_count --;
/* re-init sta_info; 20061114 */ /* re-init sta_info; 20061114 */
_rtw_init_sta_xmit_priv(&psta->sta_xmitpriv); _rtw_init_sta_xmit_priv(&psta->sta_xmitpriv);
_rtw_init_sta_recv_priv(&psta->sta_recvpriv); _rtw_init_sta_recv_priv(&psta->sta_recvpriv);
@ -475,8 +448,8 @@ _func_enter_;
unsigned long irqL; unsigned long irqL;
_list *phead, *plist; _list *phead, *plist;
union recv_frame *prframe; union recv_frame *prframe;
_queue *ppending_recvframe_queue; struct __queue *ppending_recvframe_queue;
_queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue; struct __queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue;
preorder_ctrl = &psta->recvreorder_ctrl[i]; preorder_ctrl = &psta->recvreorder_ctrl[i];
@ -657,13 +630,10 @@ _func_exit_;
u32 rtw_init_bcmc_stainfo(_adapter* padapter) u32 rtw_init_bcmc_stainfo(_adapter* padapter)
{ {
struct sta_info *psta; struct sta_info *psta;
u32 res=_SUCCESS; u32 res=_SUCCESS;
unsigned char bcast_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff}; unsigned char bcast_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff};
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
/* _queue *pstapending = &padapter->xmitpriv.bm_pending; */
_func_enter_; _func_enter_;
@ -705,7 +675,7 @@ u8 rtw_access_ctrl(_adapter *padapter, u8 *mac_addr)
u8 match = false; u8 match = false;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; 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); _enter_critical_bh(&(pacl_node_q->lock), &irqL);
phead = get_list_head(pacl_node_q); phead = get_list_head(pacl_node_q);

45
core/rtw_xmit.c
View file

@ -89,21 +89,14 @@ _func_enter_;
pxmitpriv->adapter = padapter; 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->be_pending);
_rtw_init_queue(&pxmitpriv->bk_pending); _rtw_init_queue(&pxmitpriv->bk_pending);
_rtw_init_queue(&pxmitpriv->vi_pending); _rtw_init_queue(&pxmitpriv->vi_pending);
_rtw_init_queue(&pxmitpriv->vo_pending); _rtw_init_queue(&pxmitpriv->vo_pending);
_rtw_init_queue(&pxmitpriv->bm_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); _rtw_init_queue(&pxmitpriv->free_xmit_queue);
/* /*
Please allocate memory with the sz = (struct xmit_frame) * NR_XMITFRAME, Please allocate memory with the sz = (struct xmit_frame) * NR_XMITFRAME,
and initialize free_xmit_frame below. and initialize free_xmit_frame below.
@ -263,7 +256,6 @@ _func_exit_;
return res; return res;
} }
void rtw_mfree_xmit_priv_lock (struct xmit_priv *pxmitpriv);
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); _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->vo_pending.lock);
_rtw_spinlock_free(&pxmitpriv->bm_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_xmit_queue.lock);
_rtw_spinlock_free(&pxmitpriv->free_xmitbuf_queue.lock); _rtw_spinlock_free(&pxmitpriv->free_xmitbuf_queue.lock);
_rtw_spinlock_free(&pxmitpriv->pending_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; 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; struct __queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue;
_func_enter_; _func_enter_;
@ -1493,7 +1482,7 @@ _func_exit_;
s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
{ {
unsigned long irqL; unsigned long irqL;
_queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue; struct __queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue;
_func_enter_; _func_enter_;
@ -1521,7 +1510,7 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv)
unsigned long 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; struct __queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue;
_func_enter_; _func_enter_;
@ -1561,7 +1550,7 @@ _func_exit_;
s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
{ {
unsigned long irqL; unsigned long irqL;
_queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue; struct __queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue;
_func_enter_; _func_enter_;
@ -1622,7 +1611,7 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)/* _queue *pf
unsigned long 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; struct __queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue;
_adapter *padapter = pxmitpriv->adapter; _adapter *padapter = pxmitpriv->adapter;
_func_enter_; _func_enter_;
@ -1673,7 +1662,7 @@ _func_exit_;
s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframe) s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframe)
{ {
unsigned long irqL; unsigned long irqL;
_queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue; struct __queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue;
_adapter *padapter = pxmitpriv->adapter; _adapter *padapter = pxmitpriv->adapter;
struct sk_buff *pndis_pkt = NULL; struct sk_buff *pndis_pkt = NULL;
@ -1711,7 +1700,7 @@ _func_exit_;
return _SUCCESS; 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; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
@ -1752,7 +1741,7 @@ s32 rtw_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe)
return _SUCCESS; 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; _list *xmitframe_plist, *xmitframe_phead;
struct xmit_frame *pxmitframe=NULL; 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; _list *sta_plist, *sta_phead;
struct hw_xmit *phwxmit; struct hw_xmit *phwxmit;
struct tx_servq *ptxservq = NULL; struct tx_servq *ptxservq = NULL;
_queue *pframe_queue = NULL; struct __queue *pframe_queue = NULL;
struct xmit_frame *pxmitframe = NULL; struct xmit_frame *pxmitframe = NULL;
_adapter *padapter = pxmitpriv->adapter; _adapter *padapter = pxmitpriv->adapter;
struct registry_priv *pregpriv = &padapter->registrypriv; struct registry_priv *pregpriv = &padapter->registrypriv;
@ -1809,8 +1798,6 @@ _func_enter_;
{ {
phwxmit = phwxmit_i + inx[i]; phwxmit = phwxmit_i + inx[i];
/* _enter_critical_ex(&phwxmit->sta_queue->lock, &irqL0); */
sta_phead = get_list_head(phwxmit->sta_queue); sta_phead = get_list_head(phwxmit->sta_queue);
sta_plist = get_next(sta_phead); sta_plist = get_next(sta_phead);
@ -1830,26 +1817,16 @@ _func_enter_;
/* Remove sta node when there is no pending packets. */ /* Remove sta node when there is no pending packets. */
if (_rtw_queue_empty(pframe_queue)) /* must be done after get_next and before break */ if (_rtw_queue_empty(pframe_queue)) /* must be done after get_next and before break */
rtw_list_delete(&ptxservq->tx_pending); rtw_list_delete(&ptxservq->tx_pending);
/* _exit_critical_ex(&phwxmit->sta_queue->lock, &irqL0); */
goto exit; goto exit;
} }
sta_plist = get_next(sta_plist); sta_plist = get_next(sta_plist);
} }
/* _exit_critical_ex(&phwxmit->sta_queue->lock, &irqL0); */
} }
exit: exit:
_exit_critical_bh(&pxmitpriv->lock, &irqL0); _exit_critical_bh(&pxmitpriv->lock, &irqL0);
_func_exit_; _func_exit_;
return pxmitframe; return pxmitframe;
} }
@ -1899,7 +1876,7 @@ _func_exit_;
} }
#else #else
__inline static struct tx_servq *rtw_get_sta_pending __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 tx_servq *ptxservq;
struct hw_xmit *phwxmits = padapter->xmitpriv.hwxmits; 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; _list *plist, *phead;
u8 ac_index; u8 ac_index;

3
hal/usb_ops_linux.c
View file

@ -356,8 +356,7 @@ static int recvbuf2recvframe(_adapter *padapter, struct sk_buff *pskb)
struct rx_pkt_attrib *pattrib = NULL; struct rx_pkt_attrib *pattrib = NULL;
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct recv_priv *precvpriv = &padapter->recvpriv; struct recv_priv *precvpriv = &padapter->recvpriv;
_queue *pfree_recv_queue = &precvpriv->free_recv_queue; struct __queue *pfree_recv_queue = &precvpriv->free_recv_queue;
transfer_len = (s32)pskb->len; transfer_len = (s32)pskb->len;
pbuf = pskb->data; pbuf = pskb->data;

4
include/cmd_osdep.h
View file

@ -27,7 +27,7 @@ extern sint _rtw_init_cmd_priv (struct cmd_priv *pcmdpriv);
extern sint _rtw_init_evt_priv(struct evt_priv *pevtpriv); extern sint _rtw_init_evt_priv(struct evt_priv *pevtpriv);
extern void _rtw_free_evt_priv (struct evt_priv *pevtpriv); extern void _rtw_free_evt_priv (struct evt_priv *pevtpriv);
extern void _rtw_free_cmd_priv (struct cmd_priv *pcmdpriv); extern void _rtw_free_cmd_priv (struct cmd_priv *pcmdpriv);
extern sint _rtw_enqueue_cmd(_queue *queue, struct cmd_obj *obj); extern sint _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj);
extern struct cmd_obj *_rtw_dequeue_cmd(_queue *queue); extern struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue);
#endif #endif

7
include/osdep_service.h
View file

@ -74,7 +74,6 @@
spinlock_t lock; spinlock_t lock;
}; };
typedef struct __queue _queue;
typedef struct list_head _list; typedef struct list_head _list;
typedef struct net_device * _nic_hdl; typedef struct net_device * _nic_hdl;
@ -116,7 +115,7 @@ __inline static _list *get_next(_list *list)
return list->next; return list->next;
} }
__inline static _list *get_list_head(_queue *queue) __inline static _list *get_list_head(struct __queue *queue)
{ {
return (&(queue->queue)); return (&(queue->queue));
} }
@ -381,8 +380,8 @@ extern void _rtw_mutex_free(struct mutex *pmutex);
extern void _rtw_spinlock_init(spinlock_t *plock); extern void _rtw_spinlock_init(spinlock_t *plock);
extern void _rtw_spinlock_free(spinlock_t *plock); extern void _rtw_spinlock_free(spinlock_t *plock);
extern void _rtw_init_queue(_queue *pqueue); extern void _rtw_init_queue(struct __queue *pqueue);
extern u32 _rtw_queue_empty(_queue *pqueue); extern u32 _rtw_queue_empty(struct __queue *pqueue);
extern u32 rtw_end_of_queue_search(_list *queue, _list *pelement); extern u32 rtw_end_of_queue_search(_list *queue, _list *pelement);
extern u32 rtw_get_current_time(void); extern u32 rtw_get_current_time(void);

2
include/rtw_cmd.h
View file

@ -52,7 +52,7 @@ struct cmd_obj {
struct cmd_priv { struct cmd_priv {
struct semaphore cmd_queue_sema; struct semaphore cmd_queue_sema;
struct semaphore terminate_cmdthread_sema; struct semaphore terminate_cmdthread_sema;
_queue cmd_queue; struct __queue cmd_queue;
u8 cmd_seq; u8 cmd_seq;
u8 *cmd_buf; //shall be non-paged, and 4 bytes aligned u8 *cmd_buf; //shall be non-paged, and 4 bytes aligned
u8 *cmd_allocated_buf; u8 *cmd_allocated_buf;

14
include/rtw_mlme.h
View file

@ -300,8 +300,8 @@ struct mlme_priv {
u8 not_indic_disco; u8 not_indic_disco;
_list *pscanned; _list *pscanned;
_queue free_bss_pool; struct __queue free_bss_pool;
_queue scanned_queue; struct __queue scanned_queue;
u8 *free_bss_buf; u8 *free_bss_buf;
u32 num_of_scanned; u32 num_of_scanned;
@ -550,8 +550,8 @@ extern u16 rtw_get_capability(struct wlan_bssid_ex *bss);
extern void rtw_update_scanned_network(_adapter *adapter, struct wlan_bssid_ex *target); extern void rtw_update_scanned_network(_adapter *adapter, struct wlan_bssid_ex *target);
extern void rtw_disconnect_hdl_under_linked(_adapter* adapter, struct sta_info *psta, u8 free_assoc); extern void rtw_disconnect_hdl_under_linked(_adapter* adapter, struct sta_info *psta, u8 free_assoc);
extern void rtw_generate_random_ibss(u8 *pibss); extern void rtw_generate_random_ibss(u8 *pibss);
extern struct wlan_network* rtw_find_network(_queue *scanned_queue, u8 *addr); extern struct wlan_network* rtw_find_network(struct __queue *scanned_queue, u8 *addr);
extern struct wlan_network* rtw_get_oldest_wlan_network(_queue *scanned_queue); extern struct wlan_network* rtw_get_oldest_wlan_network(struct __queue *scanned_queue);
extern void rtw_free_assoc_resources(_adapter* adapter, int lock_scanned_queue); extern void rtw_free_assoc_resources(_adapter* adapter, int lock_scanned_queue);
extern void rtw_indicate_disconnect(_adapter* adapter); extern void rtw_indicate_disconnect(_adapter* adapter);
@ -583,9 +583,9 @@ void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv);
extern void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv); extern void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv);
extern int _rtw_enqueue_network(_queue *queue, struct wlan_network *pnetwork); extern int _rtw_enqueue_network(struct __queue *queue, struct wlan_network *pnetwork);
extern struct wlan_network* _rtw_dequeue_network(_queue *queue); extern struct wlan_network* _rtw_dequeue_network(struct __queue *queue);
extern struct wlan_network* _rtw_alloc_network(struct mlme_priv *pmlmepriv); extern struct wlan_network* _rtw_alloc_network(struct mlme_priv *pmlmepriv);
@ -594,7 +594,7 @@ extern void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *
extern void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork); extern void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork);
extern struct wlan_network* _rtw_find_network(_queue *scanned_queue, u8 *addr); extern struct wlan_network* _rtw_find_network(struct __queue *scanned_queue, u8 *addr);
extern void _rtw_free_network_queue(_adapter* padapter, u8 isfreeall); extern void _rtw_free_network_queue(_adapter* padapter, u8 isfreeall);

2
include/rtw_mp.h
View file

@ -371,7 +371,7 @@ struct mp_priv
u8 *pallocated_mp_xmitframe_buf; u8 *pallocated_mp_xmitframe_buf;
u8 *pmp_xmtframe_buf; u8 *pmp_xmtframe_buf;
_queue free_mp_xmitqueue; struct __queue free_mp_xmitqueue;
u32 free_mp_xmitframe_cnt; u32 free_mp_xmitframe_cnt;
MPT_CONTEXT MptCtx; MPT_CONTEXT MptCtx;

30
include/rtw_recv.h
View file

@ -60,7 +60,7 @@ struct recv_reorder_ctrl
u16 indicate_seq;//=wstart_b, init_value=0xffff u16 indicate_seq;//=wstart_b, init_value=0xffff
u16 wend_b; u16 wend_b;
u8 wsize_b; u8 wsize_b;
_queue pending_recvframe_queue; struct __queue pending_recvframe_queue;
struct timer_list reordering_ctrl_timer; struct timer_list reordering_ctrl_timer;
}; };
@ -193,9 +193,9 @@ using enter_critical section to protect
struct recv_priv struct recv_priv
{ {
spinlock_t lock; spinlock_t lock;
_queue free_recv_queue; struct __queue free_recv_queue;
_queue recv_pending_queue; struct __queue recv_pending_queue;
_queue uc_swdec_pending_queue; struct __queue uc_swdec_pending_queue;
u8 *pallocated_frame_buf; u8 *pallocated_frame_buf;
u8 *precv_frame_buf; u8 *precv_frame_buf;
uint free_recvframe_cnt; uint free_recvframe_cnt;
@ -220,7 +220,7 @@ struct recv_priv
struct sk_buff_head rx_skb_queue; struct sk_buff_head rx_skb_queue;
u8 *pallocated_recv_buf; u8 *pallocated_recv_buf;
u8 *precv_buf; // 4 alignment u8 *precv_buf; // 4 alignment
_queue free_recv_buf_queue; struct __queue free_recv_buf_queue;
u32 free_recv_buf_queue_cnt; u32 free_recv_buf_queue_cnt;
//For display the phy informatiom //For display the phy informatiom
u8 is_signal_dbg; // for debug u8 is_signal_dbg; // for debug
@ -246,7 +246,7 @@ struct sta_recv_priv {
spinlock_t lock; spinlock_t lock;
sint option; sint option;
_queue defrag_q; //keeping the fragment frame until defrag struct __queue defrag_q; //keeping the fragment frame until defrag
struct stainfo_rxcache rxcache; struct stainfo_rxcache rxcache;
}; };
@ -337,21 +337,21 @@ union recv_frame{
}; };
extern union recv_frame *_rtw_alloc_recvframe (_queue *pfree_recv_queue); //get a free recv_frame from pfree_recv_queue extern union recv_frame *_rtw_alloc_recvframe (struct __queue *pfree_recv_queue); //get a free recv_frame from pfree_recv_queue
extern union recv_frame *rtw_alloc_recvframe (_queue *pfree_recv_queue); //get a free recv_frame from pfree_recv_queue extern union recv_frame *rtw_alloc_recvframe (struct __queue *pfree_recv_queue); //get a free recv_frame from pfree_recv_queue
extern void rtw_init_recvframe(union recv_frame *precvframe ,struct recv_priv *precvpriv); extern void rtw_init_recvframe(union recv_frame *precvframe ,struct recv_priv *precvpriv);
extern int rtw_free_recvframe(union recv_frame *precvframe, _queue *pfree_recv_queue); extern int rtw_free_recvframe(union recv_frame *precvframe, struct __queue *pfree_recv_queue);
#define rtw_dequeue_recvframe(queue) rtw_alloc_recvframe(queue) #define rtw_dequeue_recvframe(queue) rtw_alloc_recvframe(queue)
extern int _rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue); extern int _rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *queue);
extern int rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue); extern int rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *queue);
extern void rtw_free_recvframe_queue(_queue *pframequeue, _queue *pfree_recv_queue); extern void rtw_free_recvframe_queue(struct __queue *pframequeue, struct __queue *pfree_recv_queue);
u32 rtw_free_uc_swdec_pending_queue(_adapter *adapter); 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);
sint rtw_enqueue_recvbuf(struct recv_buf *precvbuf, _queue *queue); sint rtw_enqueue_recvbuf(struct recv_buf *precvbuf, struct __queue *queue);
struct recv_buf *rtw_dequeue_recvbuf (_queue *queue); struct recv_buf *rtw_dequeue_recvbuf (struct __queue *queue);
void rtw_reordering_ctrl_timeout_handler(void *pcontext); void rtw_reordering_ctrl_timeout_handler(void *pcontext);

38
include/rtw_xmit.h
View file

@ -112,7 +112,7 @@ union txdesc {
}; };
struct hw_xmit { struct hw_xmit {
_queue *sta_queue; struct __queue *sta_queue;
int accnt; int accnt;
}; };
@ -246,7 +246,7 @@ struct xmit_frame
struct tx_servq { struct tx_servq {
_list tx_pending; _list tx_pending;
_queue sta_pending; struct __queue sta_pending;
int qcnt; int qcnt;
}; };
@ -293,30 +293,17 @@ struct xmit_priv {
struct semaphore xmit_sema; struct semaphore xmit_sema;
struct semaphore terminate_xmitthread_sema; struct semaphore terminate_xmitthread_sema;
//_queue blk_strms[MAX_NUMBLKS]; struct __queue be_pending;
_queue be_pending; struct __queue bk_pending;
_queue bk_pending; struct __queue vi_pending;
_queue vi_pending; struct __queue vo_pending;
_queue vo_pending; struct __queue bm_pending;
_queue bm_pending;
//_queue legacy_dz_queue;
//_queue apsd_queue;
u8 *pallocated_frame_buf; u8 *pallocated_frame_buf;
u8 *pxmit_frame_buf; u8 *pxmit_frame_buf;
uint free_xmitframe_cnt; uint free_xmitframe_cnt;
//uint mapping_addr; struct __queue free_xmit_queue;
//uint pkt_sz;
_queue free_xmit_queue;
//struct hw_txqueue be_txqueue;
//struct hw_txqueue bk_txqueue;
//struct hw_txqueue vi_txqueue;
//struct hw_txqueue vo_txqueue;
//struct hw_txqueue bmc_txqueue;
uint frag_len; uint frag_len;
@ -325,7 +312,6 @@ struct xmit_priv {
u8 vcs_setting; u8 vcs_setting;
u8 vcs; u8 vcs;
u8 vcs_type; u8 vcs_type;
//u16 rts_thresh;
u64 tx_bytes; u64 tx_bytes;
u64 tx_pkts; u64 tx_pkts;
@ -345,13 +331,13 @@ struct xmit_priv {
int bkq_cnt; int bkq_cnt;
int viq_cnt; int viq_cnt;
int voq_cnt; int voq_cnt;
_queue free_xmitbuf_queue; struct __queue free_xmitbuf_queue;
_queue pending_xmitbuf_queue; struct __queue pending_xmitbuf_queue;
u8 *pallocated_xmitbuf; u8 *pallocated_xmitbuf;
u8 *pxmitbuf; u8 *pxmitbuf;
uint free_xmitbuf_cnt; uint free_xmitbuf_cnt;
_queue free_xmit_extbuf_queue; struct __queue free_xmit_extbuf_queue;
u8 *pallocated_xmit_extbuf; u8 *pallocated_xmit_extbuf;
u8 *pxmit_extbuf; u8 *pxmit_extbuf;
uint free_xmit_extbuf_cnt; uint free_xmit_extbuf_cnt;
@ -375,7 +361,7 @@ extern s32 rtw_put_snap(u8 *data, u16 h_proto);
extern struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv); extern struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv);
extern s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframe); extern s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframe);
extern void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, _queue *pframequeue); extern void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pframequeue);
struct tx_servq *rtw_get_sta_pending(_adapter *padapter, struct sta_info *psta, sint up, u8 *ac); struct tx_servq *rtw_get_sta_pending(_adapter *padapter, struct sta_info *psta, sint up, u8 *ac);
extern s32 rtw_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe); extern s32 rtw_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe);
extern struct xmit_frame* rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit_i, sint entry); extern struct xmit_frame* rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit_i, sint entry);

13
include/sta_info.h
View file

@ -44,7 +44,7 @@ struct wlan_acl_pool {
int mode; int mode;
int num; int num;
struct rtw_wlan_acl_node aclnode[NUM_ACL]; struct rtw_wlan_acl_node aclnode[NUM_ACL];
_queue acl_node_q; struct __queue acl_node_q;
}; };
typedef struct _RSSI_STA{ typedef struct _RSSI_STA{
@ -89,14 +89,11 @@ struct sta_info {
spinlock_t lock; spinlock_t lock;
_list list; //free_sta_queue _list list; //free_sta_queue
_list hash_list; //sta_hash _list hash_list; //sta_hash
//_list asoc_list; //20061114
//_list sleep_list;//sleep_q
//_list wakeup_list;//wakeup_q
struct sta_xmit_priv sta_xmitpriv; struct sta_xmit_priv sta_xmitpriv;
struct sta_recv_priv sta_recvpriv; struct sta_recv_priv sta_recvpriv;
_queue sleep_q; struct __queue sleep_q;
unsigned int sleepq_len; unsigned int sleepq_len;
uint state; uint state;
@ -337,13 +334,13 @@ struct sta_priv {
u8 *pallocated_stainfo_buf; u8 *pallocated_stainfo_buf;
u8 *pstainfo_buf; u8 *pstainfo_buf;
_queue free_sta_queue; struct __queue free_sta_queue;
spinlock_t sta_hash_lock; spinlock_t sta_hash_lock;
_list sta_hash[NUM_STA]; _list sta_hash[NUM_STA];
int asoc_sta_count; int asoc_sta_count;
_queue sleep_q; struct __queue sleep_q;
_queue wakeup_q; struct __queue wakeup_q;
_adapter *padapter; _adapter *padapter;

26
os_dep/ioctl_linux.c
View file

@ -1410,7 +1410,7 @@ static int rtw_wx_set_wap(struct net_device *dev,
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
_list *phead; _list *phead;
u8 *dst_bssid, *src_bssid; u8 *dst_bssid, *src_bssid;
_queue *queue = &(pmlmepriv->scanned_queue); struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
enum ndis_802_11_auth_mode authmode; enum ndis_802_11_auth_mode authmode;
@ -1760,7 +1760,7 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a,
_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);
_queue *queue = &(pmlmepriv->scanned_queue); struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
char *ev = extra; char *ev = extra;
char *stop = ev + wrqu->data.length; char *stop = ev + wrqu->data.length;
@ -1858,7 +1858,7 @@ static int rtw_wx_set_essid(struct net_device *dev,
unsigned long 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; struct __queue *queue = &pmlmepriv->scanned_queue;
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
_list *phead; _list *phead;
s8 status = true; s8 status = true;
@ -3127,7 +3127,7 @@ static int rtw_get_ap_info(struct net_device *dev,
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
_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); struct __queue *queue = &(pmlmepriv->scanned_queue);
struct iw_point *pdata = &wrqu->data; struct iw_point *pdata = &wrqu->data;
DBG_88E("+rtw_get_aplist_info\n"); DBG_88E("+rtw_get_aplist_info\n");
@ -3769,7 +3769,7 @@ static int rtw_p2p_get_wps_configmethod(struct net_device *dev,
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
unsigned long irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
_queue *queue = &(pmlmepriv->scanned_queue); struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
u8 blnMatch = 0; u8 blnMatch = 0;
u16 attr_content = 0; u16 attr_content = 0;
@ -3849,7 +3849,7 @@ static int rtw_p2p_get_go_device_address(struct net_device *dev,
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
unsigned long irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
_queue *queue = &(pmlmepriv->scanned_queue); struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
u8 blnMatch = 0; u8 blnMatch = 0;
u8 *p2pie; u8 *p2pie;
@ -3957,7 +3957,7 @@ static int rtw_p2p_get_device_type(struct net_device *dev,
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
unsigned long irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
_queue *queue = &(pmlmepriv->scanned_queue); struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
u8 blnMatch = 0; u8 blnMatch = 0;
u8 dev_type[ 8 ] = { 0x00 }; u8 dev_type[ 8 ] = { 0x00 };
@ -4048,7 +4048,7 @@ static int rtw_p2p_get_device_name(struct net_device *dev,
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
unsigned long irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
_queue *queue = &(pmlmepriv->scanned_queue); struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
u8 blnMatch = 0; u8 blnMatch = 0;
u8 dev_name[ WPS_MAX_DEVICE_NAME_LEN ] = { 0x00 }; u8 dev_name[ WPS_MAX_DEVICE_NAME_LEN ] = { 0x00 };
@ -4134,7 +4134,7 @@ static int rtw_p2p_get_invitation_procedure(struct net_device *dev,
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
unsigned long irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
_queue *queue = &(pmlmepriv->scanned_queue); struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
u8 blnMatch = 0; u8 blnMatch = 0;
u8 *p2pie; u8 *p2pie;
@ -4235,7 +4235,7 @@ static int rtw_p2p_connect(struct net_device *dev,
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
unsigned long irqL; unsigned long irqL;
_list *plist, *phead; _list *plist, *phead;
_queue *queue = &(pmlmepriv->scanned_queue); struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
uint uintPeerChannel = 0; uint uintPeerChannel = 0;
@ -4332,7 +4332,7 @@ static int rtw_p2p_invite_req(struct net_device *dev,
u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 }; u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 };
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_list *plist, *phead; _list *plist, *phead;
_queue *queue = &(pmlmepriv->scanned_queue); struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
uint uintPeerChannel = 0; uint uintPeerChannel = 0;
u8 attr_content[50] = { 0x00 }, _status = 0; u8 attr_content[50] = { 0x00 }, _status = 0;
@ -4471,7 +4471,7 @@ static int rtw_p2p_set_persistent(struct net_device *dev,
u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 }; u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 };
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_list *plist, *phead; _list *plist, *phead;
_queue *queue = &(pmlmepriv->scanned_queue); struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
uint uintPeerChannel = 0; uint uintPeerChannel = 0;
u8 attr_content[50] = { 0x00 }, _status = 0; u8 attr_content[50] = { 0x00 }, _status = 0;
@ -4526,7 +4526,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 }; u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 };
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_list *plist, *phead; _list *plist, *phead;
_queue *queue = &(pmlmepriv->scanned_queue); struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
uint uintPeerChannel = 0; uint uintPeerChannel = 0;
u8 attr_content[100] = { 0x00 }, _status = 0; u8 attr_content[100] = { 0x00 }, _status = 0;

4
os_dep/osdep_service.c
View file

@ -224,13 +224,13 @@ void _rtw_spinlock_free(spinlock_t *plock)
{ {
} }
void _rtw_init_queue(_queue *pqueue) void _rtw_init_queue(struct __queue *pqueue)
{ {
_rtw_init_listhead(&(pqueue->queue)); _rtw_init_listhead(&(pqueue->queue));
_rtw_spinlock_init(&(pqueue->lock)); _rtw_spinlock_init(&(pqueue->lock));
} }
u32 _rtw_queue_empty(_queue *pqueue) u32 _rtw_queue_empty(struct __queue *pqueue)
{ {
return rtw_is_list_empty(&(pqueue->queue)); return rtw_is_list_empty(&(pqueue->queue));
} }

2
os_dep/recv_linux.c
View file

@ -145,7 +145,7 @@ void rtw_hostapd_mlme_rx(_adapter *padapter, union recv_frame *precv_frame)
int rtw_recv_indicatepkt(_adapter *padapter, union recv_frame *precv_frame) int rtw_recv_indicatepkt(_adapter *padapter, union recv_frame *precv_frame)
{ {
struct recv_priv *precvpriv; struct recv_priv *precvpriv;
_queue *pfree_recv_queue; struct __queue *pfree_recv_queue;
struct sk_buff *skb; struct sk_buff *skb;
struct mlme_priv*pmlmepriv = &padapter->mlmepriv; struct mlme_priv*pmlmepriv = &padapter->mlmepriv;
void *br_port = NULL; void *br_port = NULL;