diff --git a/core/rtw_ap.c b/core/rtw_ap.c
index 63f67dc..f6464e7 100644
--- a/core/rtw_ap.c
+++ b/core/rtw_ap.c
@@ -281,7 +281,7 @@ static u8 chk_sta_is_alive(struct sta_info *psta)
 void	expire_timeout_chk(_adapter *padapter)
 {
 	unsigned long irqL;
-	_list	*phead, *plist;
+	struct list_head *phead, *plist;
 	u8 updated;
 	struct sta_info *psta=NULL;
 	struct sta_priv *pstapriv = &padapter->stapriv;
@@ -1206,7 +1206,7 @@ void rtw_set_macaddr_acl(_adapter *padapter, int mode)
 int rtw_acl_add_sta(_adapter *padapter, u8 *addr)
 {
 	unsigned long irqL;
-	_list	*plist, *phead;
+	struct list_head *plist, *phead;
 	u8 added = false;
 	int i, ret=0;
 	struct rtw_wlan_acl_node *paclnode;
@@ -1280,7 +1280,7 @@ int rtw_acl_add_sta(_adapter *padapter, u8 *addr)
 int rtw_acl_remove_sta(_adapter *padapter, u8 *addr)
 {
 	unsigned long irqL;
-	_list	*plist, *phead;
+	struct list_head *plist, *phead;
 	int i, ret=0;
 	struct rtw_wlan_acl_node *paclnode;
 	struct sta_priv *pstapriv = &padapter->stapriv;
@@ -1644,7 +1644,7 @@ void associated_clients_update(_adapter *padapter, u8 updated)
 	if (updated == true)
 	{
 		unsigned long irqL;
-		_list	*phead, *plist;
+		struct list_head *phead, *plist;
 		struct sta_info *psta=NULL;
 		struct sta_priv *pstapriv = &padapter->stapriv;
 
@@ -1965,7 +1965,7 @@ u8 ap_free_sta(_adapter *padapter, struct sta_info *psta, bool active, u16 reaso
 int rtw_ap_inform_ch_switch (_adapter *padapter, u8 new_ch, u8 ch_offset)
 {
 	unsigned long irqL;
-	_list	*phead, *plist;
+	struct list_head *phead, *plist;
 	int ret=0;
 	struct sta_info *psta = NULL;
 	struct sta_priv *pstapriv = &padapter->stapriv;
@@ -2002,7 +2002,7 @@ int rtw_ap_inform_ch_switch (_adapter *padapter, u8 new_ch, u8 ch_offset)
 int rtw_sta_flush(_adapter *padapter)
 {
 	unsigned long irqL;
-	_list	*phead, *plist;
+	struct list_head *phead, *plist;
 	int ret=0;
 	struct sta_info *psta = NULL;
 	struct sta_priv *pstapriv = &padapter->stapriv;
@@ -2150,7 +2150,7 @@ void start_ap_mode(_adapter *padapter)
 void stop_ap_mode(_adapter *padapter)
 {
 	unsigned long irqL;
-	_list	*phead, *plist;
+	struct list_head *phead, *plist;
 	struct rtw_wlan_acl_node *paclnode;
 	struct sta_info *psta=NULL;
 	struct sta_priv *pstapriv = &padapter->stapriv;
diff --git a/core/rtw_debug.c b/core/rtw_debug.c
index 2629c54..b66b5d9 100644
--- a/core/rtw_debug.c
+++ b/core/rtw_debug.c
@@ -911,7 +911,7 @@ int proc_get_all_sta_info(char *page, char **start,
 	_adapter *padapter = (_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;
 
diff --git a/core/rtw_ioctl_set.c b/core/rtw_ioctl_set.c
index 69036ee..0e18920 100644
--- a/core/rtw_ioctl_set.c
+++ b/core/rtw_ioctl_set.c
@@ -71,7 +71,7 @@ u8 rtw_do_join(_adapter * padapter);
 u8 rtw_do_join(_adapter * padapter)
 {
 	unsigned long	irqL;
-	_list	*plist, *phead;
+	struct list_head *plist, *phead;
 	u8* pibss = NULL;
 	struct	mlme_priv	*pmlmepriv = &(padapter->mlmepriv);
 	struct __queue *queue	= &(pmlmepriv->scanned_queue);
diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c
index 302d937..a675ca6 100644
--- a/core/rtw_mlme.c
+++ b/core/rtw_mlme.c
@@ -203,7 +203,7 @@ struct	wlan_network *_rtw_alloc_network(struct	mlme_priv *pmlmepriv )/* _queue *
 	unsigned long	irqL;
 	struct	wlan_network	*pnetwork;
 	struct __queue *free_queue = &pmlmepriv->free_bss_pool;
-	_list* plist = NULL;
+	struct list_head *plist = NULL;
 
 _func_enter_;
 
@@ -317,7 +317,7 @@ _func_exit_;
 struct wlan_network *_rtw_find_network(struct __queue *scanned_queue, u8 *addr)
 {
 
-	_list	*phead, *plist;
+	struct list_head *phead, *plist;
 	struct	wlan_network *pnetwork = NULL;
 	u8 zero_addr[ETH_ALEN] = {0,0,0,0,0,0};
 
@@ -356,7 +356,7 @@ _func_exit_;
 void _rtw_free_network_queue(_adapter *padapter, u8 isfreeall)
 {
 	unsigned long irqL;
-	_list *phead, *plist;
+	struct list_head *phead, *plist;
 	struct wlan_network *pnetwork;
 	struct mlme_priv* pmlmepriv = &padapter->mlmepriv;
 	struct __queue *scanned_queue = &pmlmepriv->scanned_queue;
@@ -592,11 +592,10 @@ _func_exit_;
 
 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;
+
 _func_enter_;
 	phead = get_list_head(scanned_queue);
 
@@ -718,7 +717,7 @@ Caller must hold pmlmepriv->lock first.
 void rtw_update_scanned_network(_adapter *adapter, struct wlan_bssid_ex *target)
 {
 	unsigned long irqL;
-	_list	*plist, *phead;
+	struct list_head *plist, *phead;
 	ULONG	bssid_ex_sz;
 	struct mlme_priv	*pmlmepriv = &(adapter->mlmepriv);
 	struct __queue *queue	= &(pmlmepriv->scanned_queue);
@@ -1105,7 +1104,7 @@ static void free_scanqueue(struct	mlme_priv *pmlmepriv)
 	unsigned long irqL, irqL0;
 	struct __queue *free_queue = &pmlmepriv->free_bss_pool;
 	struct __queue *scan_queue = &pmlmepriv->scanned_queue;
-	_list	*plist, *phead, *ptemp;
+	struct list_head *plist, *phead, *ptemp;
 
 _func_enter_;
 
@@ -2105,7 +2104,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv )
 {
 	unsigned long	irqL;
 	int ret;
-	_list	*phead;
+	struct list_head *phead;
 	_adapter *adapter;
 	struct __queue *queue	= &(pmlmepriv->scanned_queue);
 	struct	wlan_network	*pnetwork = NULL;
diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c
index afdf1c3..ca3ffe1 100644
--- a/core/rtw_mlme_ext.c
+++ b/core/rtw_mlme_ext.c
@@ -6761,7 +6761,7 @@ exit:
 void issue_action_spct_ch_switch (_adapter *padapter, u8 *ra, u8 new_ch, u8 ch_offset)
 {
 	unsigned long	irqL;
-	_list		*plist, *phead;
+	struct list_head *plist, *phead;
 	struct xmit_frame			*pmgntframe;
 	struct pkt_attrib			*pattrib;
 	unsigned char				*pframe;
@@ -6985,7 +6985,7 @@ void issue_action_BA(_adapter *padapter, unsigned char *raddr, unsigned char act
 static void issue_action_BSSCoexistPacket(_adapter *padapter)
 {
 	unsigned long	irqL;
-	_list		*plist, *phead;
+	struct list_head *plist, *phead;
 	unsigned char category, action;
 	struct xmit_frame			*pmgntframe;
 	struct pkt_attrib			*pattrib;
@@ -9578,7 +9578,7 @@ u8 tx_beacon_hdl(_adapter *padapter, unsigned char *pbuf)
 	{
 		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 sta_priv  *pstapriv = &padapter->stapriv;
 
diff --git a/core/rtw_p2p.c b/core/rtw_p2p.c
index 7fc0309..ebae335 100644
--- a/core/rtw_p2p.c
+++ b/core/rtw_p2p.c
@@ -43,7 +43,7 @@ static int rtw_p2p_is_channel_list_ok( u8 desired_ch, u8* ch_list, u8 ch_cnt )
 static int is_any_client_associated( _adapter *padapter)
 {
 	unsigned long irqL;
-	_list	*phead, *plist;
+	struct list_head *phead, *plist;
 	int	intFound = false;
 
 	struct sta_priv *pstapriv = &padapter->stapriv;
@@ -76,7 +76,7 @@ static int is_any_client_associated( _adapter *padapter)
 static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf)
 {
 	unsigned long irqL;
-	_list	*phead, *plist;
+	struct list_head *phead, *plist;
 	u32 len=0;
 	u16 attr_len = 0;
 	u8 tmplen, *pdata_attr, *pstart, *pcur;
@@ -1074,7 +1074,7 @@ u32 process_p2p_devdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le
 				if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_DEVICE_ID, dev_addr, &attr_contentlen))
 				{
 					unsigned long irqL;
-					_list	*phead, *plist;
+					struct list_head *phead, *plist;
 
 					_enter_critical_bh(&pstapriv->asoc_list_lock, &irqL);
 					phead = &pstapriv->asoc_list;
@@ -1091,13 +1091,9 @@ u32 process_p2p_devdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le
 							_rtw_memcmp(psta->dev_addr, dev_addr, ETH_ALEN))
 						{
 
-							/* _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); */
 							/* issue GO Discoverability Request */
 							issue_group_disc_req(pwdinfo, psta->hwaddr);
-							/* _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); */
-
 							status = P2P_STATUS_SUCCESS;
-
 							break;
 						}
 						else
@@ -1192,9 +1188,7 @@ static u8 rtw_p2p_get_peer_ch_list(struct wifidirect_info *pwdinfo, u8 *ch_conte
 		ch_cnt -= 1;
 		temp = *ch_content;
 		for ( i = 0 ; i < temp ; i++, j++ )
-		{
 			peer_ch_list[j] = *( ch_content + 1 + i );
-		}
 		ch_content += (temp + 1);
 		ch_cnt -= (temp + 1);
 		ch_no += temp ;
diff --git a/core/rtw_recv.c b/core/rtw_recv.c
index ef5baba..9b7aab9 100644
--- a/core/rtw_recv.c
+++ b/core/rtw_recv.c
@@ -148,7 +148,7 @@ union recv_frame *_rtw_alloc_recvframe (struct __queue *pfree_recv_queue)
 {
 
 	union recv_frame  *precvframe;
-	_list	*plist, *phead;
+	struct list_head *plist, *phead;
 	_adapter *padapter;
 	struct recv_priv *precvpriv;
 _func_enter_;
@@ -247,10 +247,7 @@ sint _rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *queue)
 
 _func_enter_;
 
-	/* _rtw_init_listhead(&(precvframe->u.hdr.list)); */
 	rtw_list_delete(&(precvframe->u.hdr.list));
-
-
 	rtw_list_insert_tail(&(precvframe->u.hdr.list), get_list_head(queue));
 
 	if (padapter != NULL) {
@@ -286,7 +283,7 @@ using spinlock to protect
 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;
 
 _func_enter_;
 	spin_lock(&pframequeue->lock);
@@ -353,7 +350,7 @@ struct recv_buf *rtw_dequeue_recvbuf (struct __queue *queue)
 {
 	unsigned long irqL;
 	struct recv_buf *precvbuf;
-	_list	*plist, *phead;
+	struct list_head *plist, *phead;
 
 	_enter_critical_ex(&queue->lock, &irqL);
 
@@ -1256,7 +1253,7 @@ sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame)
 		if ((psta->state&WIFI_SLEEP_STATE) && (pstapriv->sta_dz_bitmap&BIT(psta->aid)))
 		{
 			unsigned long irqL;
-			_list	*xmitframe_plist, *xmitframe_phead;
+			struct list_head *xmitframe_plist, *xmitframe_phead;
 			struct xmit_frame *pxmitframe=NULL;
 
 			_enter_critical_bh(&psta->sleep_q.lock, &irqL);
@@ -1838,7 +1835,7 @@ _func_exit_;
 /* perform defrag */
 union recv_frame *recvframe_defrag(_adapter *adapter, struct __queue *defrag_q)
 {
-	_list	 *plist, *phead;
+	struct list_head *plist, *phead;
 	u8 wlanhdr_offset;
 	u8	curfragnum;
 	struct recv_frame_hdr *pfhdr,*pnfhdr;
@@ -1931,7 +1928,7 @@ union recv_frame* recvframe_chk_defrag(PADAPTER padapter, union recv_frame *prec
 	struct recv_frame_hdr *pfhdr;
 	struct sta_info *psta;
 	struct sta_priv *pstapriv;
-	_list *phead;
+	struct list_head *phead;
 	union recv_frame *prtnframe = NULL;
 	struct __queue *pfree_recv_queue, *pdefrag_q;
 
@@ -2213,7 +2210,7 @@ int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union rec
 {
 	struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib;
 	struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
-	_list	*phead, *plist;
+	struct list_head *phead, *plist;
 	union recv_frame *pnextrframe;
 	struct rx_pkt_attrib *pnextattrib;
 
@@ -2240,7 +2237,7 @@ int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union rec
 
 static int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced)
 {
-	_list	*phead, *plist;
+	struct list_head *phead, *plist;
 	union recv_frame *prframe;
 	struct rx_pkt_attrib *pattrib;
 	int bPktInBuf = false;
diff --git a/core/rtw_sta_mgt.c b/core/rtw_sta_mgt.c
index ec7d5e5..e603c25 100644
--- a/core/rtw_sta_mgt.c
+++ b/core/rtw_sta_mgt.c
@@ -202,7 +202,7 @@ void rtw_mfree_all_stainfo(struct sta_priv *pstapriv );
 void rtw_mfree_all_stainfo(struct sta_priv *pstapriv )
 {
 	unsigned long	 irqL;
-	_list	*plist, *phead;
+	struct list_head *plist, *phead;
 	struct sta_info *psta = NULL;
 
 _func_enter_;
@@ -252,7 +252,7 @@ void rtw_mfree_sta_priv_lock(struct	sta_priv *pstapriv)
 u32	_rtw_free_sta_priv(struct	sta_priv *pstapriv)
 {
 	unsigned long	irqL;
-	_list	*phead, *plist;
+	struct list_head *phead, *plist;
 	struct sta_info *psta = NULL;
 	struct recv_reorder_ctrl *preorder_ctrl;
 	int	index;
@@ -296,7 +296,7 @@ struct	sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
 {
 	unsigned long irqL, irqL2;
 	s32	index;
-	_list	*phash_list;
+	struct list_head *phash_list;
 	struct sta_info	*psta;
 	struct __queue *pfree_sta_queue;
 	struct recv_reorder_ctrl *preorder_ctrl;
@@ -446,7 +446,7 @@ _func_enter_;
 	for (i=0; i < 16 ; i++)
 	{
 		unsigned long irqL;
-		_list	*phead, *plist;
+		struct list_head *phead, *plist;
 		union recv_frame *prframe;
 		struct __queue *ppending_recvframe_queue;
 		struct __queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue;
@@ -533,7 +533,7 @@ _func_exit_;
 void rtw_free_all_stainfo(_adapter *padapter)
 {
 	unsigned long	 irqL;
-	_list	*plist, *phead;
+	struct list_head *plist, *phead;
 	s32	index;
 	struct sta_info *psta = NULL;
 	struct	sta_priv *pstapriv = &padapter->stapriv;
@@ -574,17 +574,11 @@ _func_exit_;
 /* any station allocated can be searched by hash list */
 struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
 {
-
 	unsigned long	 irqL;
-
-	_list	*plist, *phead;
-
+	struct list_head *plist, *phead;
 	struct sta_info *psta = NULL;
-
 	u32	index;
-
 	u8 *addr;
-
 	u8 bc_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff};
 
 _func_enter_;
@@ -593,13 +587,9 @@ _func_enter_;
 		return NULL;
 
 	if (IS_MCAST(hwaddr))
-	{
 		addr = bc_addr;
-	}
 	else
-	{
 		addr = hwaddr;
-	}
 
 	index = wifi_mac_hash(addr);
 
@@ -670,7 +660,7 @@ u8 rtw_access_ctrl(_adapter *padapter, u8 *mac_addr)
 	u8 res = true;
 #ifdef  CONFIG_AP_MODE
 	unsigned long irqL;
-	_list	*plist, *phead;
+	struct list_head *plist, *phead;
 	struct rtw_wlan_acl_node *paclnode;
 	u8 match = false;
 	struct sta_priv *pstapriv = &padapter->stapriv;
diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c
index 876a65e..ba5c71a 100644
--- a/core/rtw_xmit.c
+++ b/core/rtw_xmit.c
@@ -1438,7 +1438,7 @@ struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv)
 {
 	unsigned long irqL;
 	struct xmit_buf *pxmitbuf =  NULL;
-	_list *plist, *phead;
+	struct list_head *plist, *phead;
 	struct __queue *pfree_queue = &pxmitpriv->free_xmit_extbuf_queue;
 
 _func_enter_;
@@ -1509,7 +1509,7 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv)
 {
 	unsigned long irqL;
 	struct xmit_buf *pxmitbuf =  NULL;
-	_list *plist, *phead;
+	struct list_head *plist, *phead;
 	struct __queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue;
 
 _func_enter_;
@@ -1610,7 +1610,7 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)/* _queue *pf
 
 	unsigned long irqL;
 	struct xmit_frame *pxframe = NULL;
-	_list *plist, *phead;
+	struct list_head *plist, *phead;
 	struct __queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue;
 	_adapter *padapter = pxmitpriv->adapter;
 
@@ -1703,7 +1703,7 @@ _func_exit_;
 void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pframequeue)
 {
 	unsigned long irqL;
-	_list	*plist, *phead;
+	struct list_head *plist, *phead;
 	struct	xmit_frame	*pxmitframe;
 
 _func_enter_;
@@ -1743,7 +1743,7 @@ s32 rtw_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe)
 
 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);
@@ -1771,7 +1771,7 @@ static struct xmit_frame *dequeue_one_xmitframe(struct xmit_priv *pxmitpriv, str
 struct xmit_frame* rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit_i, sint entry)
 {
 	unsigned long irqL0;
-	_list *sta_plist, *sta_phead;
+	struct list_head *sta_plist, *sta_phead;
 	struct hw_xmit *phwxmit;
 	struct tx_servq *ptxservq = NULL;
 	struct __queue *pframe_queue = NULL;
@@ -1954,22 +1954,12 @@ _func_enter_;
 
 	ptxservq = rtw_get_sta_pending(padapter, psta, pattrib->priority, (u8 *)(&ac_index));
 
-	/* _enter_critical(&pstapending->lock, &irqL0); */
-
-	if (rtw_is_list_empty(&ptxservq->tx_pending)) {
+	if (rtw_is_list_empty(&ptxservq->tx_pending))
 		rtw_list_insert_tail(&ptxservq->tx_pending, get_list_head(phwxmits[ac_index].sta_queue));
-	}
-
-	/* _enter_critical(&ptxservq->sta_pending.lock, &irqL1); */
 
 	rtw_list_insert_tail(&pxmitframe->list, get_list_head(&ptxservq->sta_pending));
 	ptxservq->qcnt++;
 	phwxmits[ac_index].accnt++;
-
-	/* _exit_critical(&ptxservq->sta_pending.lock, &irqL1); */
-
-	/* _exit_critical(&pstapending->lock, &irqL0); */
-
 exit:
 
 _func_exit_;
@@ -2054,12 +2044,7 @@ void rtw_init_hwxmits(struct hw_xmit *phwxmit, sint entry)
 	sint i;
 _func_enter_;
 	for (i = 0; i < entry; i++, phwxmit++)
-	{
-		/* _rtw_spinlock_init(&phwxmit->xmit_lock); */
-		/* _rtw_init_listhead(&phwxmit->pending); */
-		/* phwxmit->txcmdcnt = 0; */
 		phwxmit->accnt = 0;
-	}
 _func_exit_;
 }
 
@@ -2068,13 +2053,11 @@ static int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb)
 	struct sk_buff *skb = *pskb;
 	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
 	unsigned long irqL;
-	/* if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == true) */
 	{
 		int res, is_vlan_tag=0, i, do_nat25=1;
 		unsigned short vlan_hdr=0;
 		void *br_port = NULL;
 
-		/* mac_clone_handle_frame(priv, skb); */
 
 #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
 		br_port = padapter->pnetdev->br_port;
@@ -2403,8 +2386,6 @@ sint xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *p
 		{
 			rtw_list_delete(&pxmitframe->list);
 
-			/* _enter_critical_bh(&psta->sleep_q.lock, &irqL); */
-
 			rtw_list_insert_tail(&pxmitframe->list, get_list_head(&psta->sleep_q));
 
 			psta->sleepq_len++;
@@ -2468,7 +2449,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, struct __queue *pframequeue)
 {
-	_list	*plist, *phead;
+	struct list_head *plist, *phead;
 	u8	ac_index;
 	struct tx_servq	*ptxservq;
 	struct pkt_attrib	*pattrib;
@@ -2544,7 +2525,7 @@ void wakeup_sta_to_xmit(_adapter *padapter, struct sta_info *psta)
 	unsigned long irqL;
 	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;
 
@@ -2702,7 +2683,7 @@ void xmit_delivery_enabled_frames(_adapter *padapter, struct sta_info *psta)
 {
 	unsigned long irqL;
 	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;
 
diff --git a/hal/rtl8188eu_xmit.c b/hal/rtl8188eu_xmit.c
index d723db3..539f154 100644
--- a/hal/rtl8188eu_xmit.c
+++ b/hal/rtl8188eu_xmit.c
@@ -519,7 +519,7 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
 	struct tx_servq *ptxservq = NULL;
 
 	unsigned long irqL;
-	_list *xmitframe_plist = NULL, *xmitframe_phead = NULL;
+	struct list_head *xmitframe_plist = NULL, *xmitframe_phead = NULL;
 
 	u32	pbuf;	/*  next pkt address */
 	u32	pbuf_tail;	/*  last pkt tail */
diff --git a/include/ieee80211.h b/include/ieee80211.h
index 0f017e8..411e323 100644
--- a/include/ieee80211.h
+++ b/include/ieee80211.h
@@ -296,7 +296,7 @@ struct ieee_ibss_seq {
 	u16 seq_num;
 	u16 frag_num;
 	unsigned long packet_time;
-	_list	list;
+	struct list_head list;
 };
 
 struct rtw_ieee80211_hdr {
diff --git a/include/osdep_service.h b/include/osdep_service.h
index 0bf46d2..a3e5982 100644
--- a/include/osdep_service.h
+++ b/include/osdep_service.h
@@ -74,7 +74,6 @@
 		spinlock_t lock;
 	};
 
-	typedef struct	list_head	_list;
 	typedef	struct	net_device * _nic_hdl;
 
 	#define thread_exit() complete_and_exit(NULL, 0)
@@ -110,12 +109,12 @@ static inline unsigned char *skb_end_pointer(const struct sk_buff *skb)
 }
 #endif
 
-__inline static _list *get_next(_list	*list)
+__inline static struct list_head *get_next(struct list_head *list)
 {
 	return list->next;
 }
 
-__inline static _list	*get_list_head(struct __queue *queue)
+__inline static struct list_head *get_list_head(struct __queue *queue)
 {
 	return (&(queue->queue));
 }
@@ -176,7 +175,7 @@ __inline static void _exit_critical_mutex(struct mutex *pmutex, unsigned long *p
 #endif
 }
 
-__inline static void rtw_list_delete(_list *plist)
+__inline static void rtw_list_delete(struct list_head *plist)
 {
 	list_del_init(plist);
 }
@@ -365,11 +364,11 @@ extern void	_rtw_memcpy(void* dec, void* sour, u32 sz);
 extern int	_rtw_memcmp(void *dst, void *src, u32 sz);
 extern void	_rtw_memset(void *pbuf, int c, u32 sz);
 
-extern void	_rtw_init_listhead(_list *list);
-extern u32	rtw_is_list_empty(_list *phead);
-extern void	rtw_list_insert_head(_list *plist, _list *phead);
-extern void	rtw_list_insert_tail(_list *plist, _list *phead);
-extern void	rtw_list_delete(_list *plist);
+extern void	_rtw_init_listhead(struct list_head *list);
+extern u32	rtw_is_list_empty(struct list_head *phead);
+extern void	rtw_list_insert_head(struct list_head *plist, struct list_head *phead);
+extern void	rtw_list_insert_tail(struct list_head *plist, struct list_head *phead);
+extern void	rtw_list_delete(struct list_head *plist);
 
 extern void	_rtw_init_sema(struct semaphore *sema, int init_val);
 extern void	_rtw_free_sema(struct semaphore *sema);
@@ -382,7 +381,7 @@ extern void	_rtw_spinlock_free(spinlock_t *plock);
 
 extern void	_rtw_init_queue(struct __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(struct list_head *queue, struct list_head *pelement);
 
 extern u32	rtw_get_current_time(void);
 extern u32	rtw_systime_to_ms(u32 systime);
diff --git a/include/rtw_cmd.h b/include/rtw_cmd.h
index cb9ab19..5444801 100644
--- a/include/rtw_cmd.h
+++ b/include/rtw_cmd.h
@@ -46,7 +46,7 @@ struct cmd_obj {
 	u32	cmdsz;
 	u8	*rsp;
 	u32	rspsz;
-	_list	list;
+	struct list_head list;
 };
 
 struct cmd_priv {
diff --git a/include/rtw_io.h b/include/rtw_io.h
index dbe82e2..92c1e1c 100644
--- a/include/rtw_io.h
+++ b/include/rtw_io.h
@@ -148,7 +148,7 @@ struct _io_ops {
 };
 
 struct io_req {
-	_list	list;
+	struct list_head list;
 	u32	addr;
 	volatile u32	val;
 	u32	command;
@@ -290,9 +290,9 @@ Below is the data structure used by _io_handler
 
 struct io_queue {
 	spinlock_t lock;
-	_list	free_ioreqs;
-	_list		pending;		//The io_req list that will be served in the single protocol read/write.
-	_list		processing;
+	struct list_head free_ioreqs;
+	struct list_head pending;		//The io_req list that will be served in the single protocol read/write.
+	struct list_head processing;
 	u8	*free_ioreqs_buf; // 4-byte aligned
 	u8	*pallocated_free_ioreqs_buf;
 	struct	intf_hdl	intf;
diff --git a/include/rtw_mlme.h b/include/rtw_mlme.h
index 17093df..96f0118 100644
--- a/include/rtw_mlme.h
+++ b/include/rtw_mlme.h
@@ -299,7 +299,7 @@ struct mlme_priv {
 	u8	*nic_hdl;
 
 	u8	not_indic_disco;
-	_list		*pscanned;
+	struct list_head *pscanned;
 	struct __queue free_bss_pool;
 	struct __queue scanned_queue;
 	u8		*free_bss_buf;
diff --git a/include/rtw_mp.h b/include/rtw_mp.h
index 83e7551..5ed85c6 100644
--- a/include/rtw_mp.h
+++ b/include/rtw_mp.h
@@ -105,7 +105,7 @@ typedef enum _ANTENNA_PATH{
 
 struct mp_xmit_frame
 {
-	_list	list;
+	struct list_head list;
 
 	struct pkt_attrib attrib;
 
diff --git a/include/rtw_recv.h b/include/rtw_recv.h
index 9897ce9..f5e07d4 100644
--- a/include/rtw_recv.h
+++ b/include/rtw_recv.h
@@ -252,7 +252,7 @@ struct sta_recv_priv {
 
 struct recv_buf
 {
-	_list list;
+	struct list_head list;
 
 	spinlock_t recvbuf_lock;
 
@@ -296,7 +296,7 @@ struct recv_buf
 */
 struct recv_frame_hdr
 {
-	_list	list;
+	struct list_head list;
 	struct sk_buff	 *pkt;
 	struct sk_buff	 *pkt_newalloc;
 
@@ -327,7 +327,7 @@ struct recv_frame_hdr
 union recv_frame{
 
 	union{
-		_list list;
+		struct list_head list;
 		struct recv_frame_hdr hdr;
 		uint mem[RECVFRAME_HDR_ALIGN>>2];
 	}u;
diff --git a/include/rtw_xmit.h b/include/rtw_xmit.h
index 01f4e13..debce37 100644
--- a/include/rtw_xmit.h
+++ b/include/rtw_xmit.h
@@ -207,14 +207,10 @@ void rtw_sctx_done(struct submit_ctx **sctx);
 
 struct xmit_buf
 {
-	_list	list;
-
+	struct list_head list;
 	_adapter *padapter;
-
 	u8 *pallocated_buf;
-
 	u8 *pbuf;
-
 	void *priv_data;
 
 	u16 ext_tag; // 0: Normal xmitbuf, 1: extension xmitbuf.
@@ -231,7 +227,7 @@ struct xmit_buf
 
 struct xmit_frame
 {
-	_list	list;
+	struct list_head list;
 	struct pkt_attrib attrib;
 	struct sk_buff *pkt;
 	int	frame_tag;
@@ -245,7 +241,7 @@ struct xmit_frame
 };
 
 struct tx_servq {
-	_list	tx_pending;
+	struct list_head tx_pending;
 	struct __queue sta_pending;
 	int qcnt;
 };
@@ -263,8 +259,8 @@ struct sta_xmit_priv
 	struct tx_servq	bk_q;			//priority == 1,2
 	struct tx_servq	vi_q;			//priority == 4,5
 	struct tx_servq	vo_q;			//priority == 6,7
-	_list	legacy_dz;
-	_list  apsd;
+	struct list_head legacy_dz;
+	struct list_head apsd;
 
 	u16 txseq_tid[16];
 };
diff --git a/include/sta_info.h b/include/sta_info.h
index 7191575..99b2a6b 100644
--- a/include/sta_info.h
+++ b/include/sta_info.h
@@ -32,7 +32,7 @@
 //if mode ==0, then the sta is allowed once the addr is hit.
 //if mode ==1, then the sta is rejected once the addr is non-hit.
 struct rtw_wlan_acl_node {
-        _list		        list;
+        struct list_head list;
         u8       addr[ETH_ALEN];
         u8       valid;
 };
@@ -87,8 +87,8 @@ struct	stainfo_stats	{
 struct sta_info {
 
 	spinlock_t lock;
-	_list	list; //free_sta_queue
-	_list	hash_list; //sta_hash
+	struct list_head list; //free_sta_queue
+	struct list_head hash_list; //sta_hash
 
 	struct sta_xmit_priv sta_xmitpriv;
 	struct sta_recv_priv sta_recvpriv;
@@ -151,8 +151,8 @@ struct sta_info {
 
 #ifdef CONFIG_AP_MODE
 
-	_list asoc_list;
-	_list auth_list;
+	struct list_head asoc_list;
+	struct list_head auth_list;
 
 	unsigned int expire_to;
 	unsigned int auth_seq;
@@ -337,7 +337,7 @@ struct	sta_priv {
 	struct __queue free_sta_queue;
 
 	spinlock_t sta_hash_lock;
-	_list   sta_hash[NUM_STA];
+	struct list_head sta_hash[NUM_STA];
 	int asoc_sta_count;
 	struct __queue sleep_q;
 	struct __queue wakeup_q;
@@ -346,8 +346,8 @@ struct	sta_priv {
 
 
 #ifdef CONFIG_AP_MODE
-	_list asoc_list;
-	_list auth_list;
+	struct list_head asoc_list;
+	struct list_head auth_list;
 	spinlock_t asoc_list_lock;
 	spinlock_t auth_list_lock;
 	u8 asoc_list_cnt;
diff --git a/include/wlan_bssdef.h b/include/wlan_bssdef.h
index 9415267..e0231de 100644
--- a/include/wlan_bssdef.h
+++ b/include/wlan_bssdef.h
@@ -274,7 +274,7 @@ static inline uint get_wlan_bssid_ex_sz(struct wlan_bssid_ex *bss)
 }
 
 struct	wlan_network {
-	_list	list;
+	struct list_head list;
 	int	network_type;	//refer to ieee80211.h for WIRELESS_11A/B/G
 	int	fixed;			// set to fixed when not to be removed as site-surveying
 	unsigned long	last_scanned; //timestamp for the network
diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c
index f85da8d..72bb3c6 100644
--- a/os_dep/ioctl_linux.c
+++ b/os_dep/ioctl_linux.c
@@ -1408,7 +1408,7 @@ static int rtw_wx_set_wap(struct net_device *dev,
 	_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
 	struct sockaddr *temp = (struct sockaddr *)awrq;
 	struct	mlme_priv	*pmlmepriv = &(padapter->mlmepriv);
-	_list	*phead;
+	struct list_head *phead;
 	u8 *dst_bssid, *src_bssid;
 	struct __queue *queue	= &(pmlmepriv->scanned_queue);
 	struct	wlan_network	*pnetwork = NULL;
@@ -1757,7 +1757,7 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a,
 			     union iwreq_data *wrqu, char *extra)
 {
 	unsigned long	irqL;
-	_list					*plist, *phead;
+	struct list_head *plist, *phead;
 	_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
 	struct	mlme_priv	*pmlmepriv = &(padapter->mlmepriv);
 	struct __queue *queue	= &(pmlmepriv->scanned_queue);
@@ -1860,7 +1860,7 @@ static int rtw_wx_set_essid(struct net_device *dev,
 	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 	struct __queue *queue = &pmlmepriv->scanned_queue;
 	struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
-	_list *phead;
+	struct list_head *phead;
 	s8 status = true;
 	struct wlan_network *pnetwork = NULL;
 	enum ndis_802_11_auth_mode authmode;
@@ -3120,7 +3120,7 @@ static int rtw_get_ap_info(struct net_device *dev,
 	int bssid_match, ret = 0;
 	u32 cnt=0, wpa_ielen;
 	unsigned long	irqL;
-	_list	*plist, *phead;
+	struct list_head *plist, *phead;
 	unsigned char *pbuf;
 	u8 bssid[ETH_ALEN];
 	char data[32];
@@ -3768,7 +3768,7 @@ static int rtw_p2p_get_wps_configmethod(struct net_device *dev,
 	u8					peerMACStr[ 17 ] = { 0x00 };
 	struct mlme_priv		*pmlmepriv = &padapter->mlmepriv;
 	unsigned long				irqL;
-	_list					*plist, *phead;
+	struct list_head *plist, *phead;
 	struct __queue *queue	= &(pmlmepriv->scanned_queue);
 	struct	wlan_network	*pnetwork = NULL;
 	u8					blnMatch = 0;
@@ -3848,7 +3848,7 @@ static int rtw_p2p_get_go_device_address(struct net_device *dev,
 	u8					peerMACStr[ 17 ] = { 0x00 };
 	struct mlme_priv		*pmlmepriv = &padapter->mlmepriv;
 	unsigned long				irqL;
-	_list					*plist, *phead;
+	struct list_head *plist, *phead;
 	struct __queue *queue	= &(pmlmepriv->scanned_queue);
 	struct	wlan_network	*pnetwork = NULL;
 	u8					blnMatch = 0;
@@ -3956,7 +3956,7 @@ static int rtw_p2p_get_device_type(struct net_device *dev,
 	u8					peerMACStr[ 17 ] = { 0x00 };
 	struct mlme_priv		*pmlmepriv = &padapter->mlmepriv;
 	unsigned long				irqL;
-	_list					*plist, *phead;
+	struct list_head *plist, *phead;
 	struct __queue *queue	= &(pmlmepriv->scanned_queue);
 	struct	wlan_network	*pnetwork = NULL;
 	u8					blnMatch = 0;
@@ -4047,7 +4047,7 @@ static int rtw_p2p_get_device_name(struct net_device *dev,
 	u8					peerMACStr[ 17 ] = { 0x00 };
 	struct mlme_priv		*pmlmepriv = &padapter->mlmepriv;
 	unsigned long				irqL;
-	_list					*plist, *phead;
+	struct list_head *plist, *phead;
 	struct __queue *queue	= &(pmlmepriv->scanned_queue);
 	struct	wlan_network	*pnetwork = NULL;
 	u8					blnMatch = 0;
@@ -4133,7 +4133,7 @@ static int rtw_p2p_get_invitation_procedure(struct net_device *dev,
 	u8					peerMACStr[ 17 ] = { 0x00 };
 	struct mlme_priv		*pmlmepriv = &padapter->mlmepriv;
 	unsigned long				irqL;
-	_list					*plist, *phead;
+	struct list_head *plist, *phead;
 	struct __queue *queue	= &(pmlmepriv->scanned_queue);
 	struct	wlan_network	*pnetwork = NULL;
 	u8					blnMatch = 0;
@@ -4234,7 +4234,7 @@ static int rtw_p2p_connect(struct net_device *dev,
 	u8					peerMACStr[ ETH_ALEN * 2 ] = { 0x00 };
 	struct mlme_priv		*pmlmepriv = &padapter->mlmepriv;
 	unsigned long				irqL;
-	_list					*plist, *phead;
+	struct list_head *plist, *phead;
 	struct __queue *queue	= &(pmlmepriv->scanned_queue);
 	struct	wlan_network	*pnetwork = NULL;
 	uint					uintPeerChannel = 0;
@@ -4331,7 +4331,7 @@ static int rtw_p2p_invite_req(struct net_device *dev,
 	int						jj,kk;
 	u8						peerMACStr[ ETH_ALEN * 2 ] = { 0x00 };
 	struct mlme_priv			*pmlmepriv = &padapter->mlmepriv;
-	_list						*plist, *phead;
+	struct list_head *plist, *phead;
 	struct __queue *queue	= &(pmlmepriv->scanned_queue);
 	struct	wlan_network		*pnetwork = NULL;
 	uint						uintPeerChannel = 0;
@@ -4470,7 +4470,7 @@ static int rtw_p2p_set_persistent(struct net_device *dev,
 	int						jj,kk;
 	u8						peerMACStr[ ETH_ALEN * 2 ] = { 0x00 };
 	struct mlme_priv			*pmlmepriv = &padapter->mlmepriv;
-	_list						*plist, *phead;
+	struct list_head *plist, *phead;
 	struct __queue *queue	= &(pmlmepriv->scanned_queue);
 	struct	wlan_network		*pnetwork = NULL;
 	uint						uintPeerChannel = 0;
@@ -4525,7 +4525,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
 	int					jj,kk;
 	u8					peerMACStr[ ETH_ALEN * 2 ] = { 0x00 };
 	struct mlme_priv		*pmlmepriv = &padapter->mlmepriv;
-	_list					*plist, *phead;
+	struct list_head *plist, *phead;
 	struct __queue *queue	= &(pmlmepriv->scanned_queue);
 	struct	wlan_network	*pnetwork = NULL;
 	uint					uintPeerChannel = 0;
@@ -5391,7 +5391,7 @@ static int rtw_dbg_port(struct net_device *dev,
 				case 0x09:
 					{
 						int i, j;
-						_list	*plist, *phead;
+						struct list_head *plist, *phead;
 						struct recv_reorder_ctrl *preorder_ctrl;
 
 #ifdef CONFIG_AP_MODE
@@ -6338,19 +6338,13 @@ static int rtw_set_beacon(struct net_device *dev, struct ieee_param *param, int
 	else
 		ret = -EINVAL;
 
-
 	return ret;
-
 }
 
 static int rtw_hostapd_sta_flush(struct net_device *dev)
 {
-	//unsigned long irqL;
-	//_list	*phead, *plist;
 	int ret=0;
-	//struct sta_info *psta = NULL;
 	_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
-	//struct sta_priv *pstapriv = &padapter->stapriv;
 
 	DBG_88E("%s\n", __func__);
 
@@ -6359,7 +6353,6 @@ static int rtw_hostapd_sta_flush(struct net_device *dev)
 	ret = rtw_sta_flush(padapter);
 
 	return ret;
-
 }
 
 static int rtw_add_sta(struct net_device *dev, struct ieee_param *param)
diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c
index 3d1e366..c34ab67 100644
--- a/os_dep/osdep_service.c
+++ b/os_dep/osdep_service.c
@@ -145,7 +145,7 @@ void _rtw_memset(void *pbuf, int c, u32 sz)
         memset(pbuf, c, sz);
 }
 
-void _rtw_init_listhead(_list *list)
+void _rtw_init_listhead(struct list_head *list)
 {
         INIT_LIST_HEAD(list);
 }
@@ -155,7 +155,7 @@ For the following list_xxx operations,
 caller must guarantee the atomic context.
 Otherwise, there will be racing condition.
 */
-u32	rtw_is_list_empty(_list *phead)
+u32	rtw_is_list_empty(struct list_head *phead)
 {
 	if (list_empty(phead))
 		return true;
@@ -163,12 +163,12 @@ u32	rtw_is_list_empty(_list *phead)
 		return false;
 }
 
-void rtw_list_insert_head(_list *plist, _list *phead)
+void rtw_list_insert_head(struct list_head *plist, struct list_head *phead)
 {
 	list_add(plist, phead);
 }
 
-void rtw_list_insert_tail(_list *plist, _list *phead)
+void rtw_list_insert_tail(struct list_head *plist, struct list_head *phead)
 {
 	list_add_tail(plist, phead);
 }
@@ -235,7 +235,7 @@ u32	  _rtw_queue_empty(struct __queue *pqueue)
 	return rtw_is_list_empty(&(pqueue->queue));
 }
 
-u32 rtw_end_of_queue_search(_list *head, _list *plist)
+u32 rtw_end_of_queue_search(struct list_head *head, struct list_head *plist)
 {
 	if (head == plist)
 		return true;
diff --git a/os_dep/xmit_linux.c b/os_dep/xmit_linux.c
index 83557a4..a080b3c 100644
--- a/os_dep/xmit_linux.c
+++ b/os_dep/xmit_linux.c
@@ -226,7 +226,7 @@ static int rtw_mlcst2unicst(_adapter *padapter, struct sk_buff *skb)
 	struct	sta_priv *pstapriv = &padapter->stapriv;
 	struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
 	unsigned long	irqL;
-	_list	*phead, *plist;
+	struct list_head *phead, *plist;
 	struct sk_buff *newskb;
 	struct sta_info *psta = NULL;
 	s32	res;