OSDN Git Service

staging: rtl8723bs: update to the latest driver
[android-x86/kernel.git] / drivers / staging / rtl8723bs / core / rtw_recv.c
index 51076dd..e3ec9bc 100644 (file)
  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- *
  ******************************************************************************/
 #define _RTW_RECV_C_
 
 #include <drv_types.h>
+#include <rtw_debug.h>
 #include <linux/jiffies.h>
+#include <rtw_recv.h>
+
+static u8 SNAP_ETH_TYPE_IPX[2] = {0x81, 0x37};
+static u8 SNAP_ETH_TYPE_APPLETALK_AARP[2] = {0x80, 0xf3};
+
+u8 rtw_rfc1042_header[] =
+{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
+/* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */
+u8 rtw_bridge_tunnel_header[] =
+{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };
 
 void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS);
 
 void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv)
 {
-
-
-_func_enter_;
-
        memset((u8 *)psta_recvpriv, 0, sizeof (struct sta_recv_priv));
 
        spin_lock_init(&psta_recvpriv->lock);
 
-       //for(i=0; i<MAX_RX_NUMBLKS; i++)
-       //      _rtw_init_queue(&psta_recvpriv->blk_strms[i]);
+       /* for (i = 0; i<MAX_RX_NUMBLKS; i++) */
+       /*      _rtw_init_queue(&psta_recvpriv->blk_strms[i]); */
 
        _rtw_init_queue(&psta_recvpriv->defrag_q);
-
-_func_exit_;
-
 }
 
-sint _rtw_init_recv_priv(struct recv_priv *precvpriv, _adapter *padapter)
+sint _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
 {
        sint i;
-
        union recv_frame *precvframe;
+       sint    res = _SUCCESS;
 
-       sint    res=_SUCCESS;
-
-_func_enter_;
-
-       // We don't need to memset padapter->XXX to zero, because adapter is allocated by vzalloc().
-       //memset((unsigned char *)precvpriv, 0, sizeof (struct  recv_priv));
+       /*  We don't need to memset padapter->XXX to zero, because adapter is allocated by vzalloc(). */
+       /* memset((unsigned char *)precvpriv, 0, sizeof (struct  recv_priv)); */
 
        spin_lock_init(&precvpriv->lock);
 
@@ -68,20 +63,20 @@ _func_enter_;
 
        precvpriv->pallocated_frame_buf = vzalloc(NR_RECVFRAME * sizeof(union recv_frame) + RXFRAME_ALIGN_SZ);
 
-       if(precvpriv->pallocated_frame_buf==NULL){
-               res= _FAIL;
+       if (precvpriv->pallocated_frame_buf == NULL) {
+               res = _FAIL;
                goto exit;
        }
-       //memset(precvpriv->pallocated_frame_buf, 0, NR_RECVFRAME * sizeof(union recv_frame) + RXFRAME_ALIGN_SZ);
+       /* memset(precvpriv->pallocated_frame_buf, 0, NR_RECVFRAME * sizeof(union recv_frame) + RXFRAME_ALIGN_SZ); */
 
        precvpriv->precv_frame_buf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(precvpriv->pallocated_frame_buf), RXFRAME_ALIGN_SZ);
-       //precvpriv->precv_frame_buf = precvpriv->pallocated_frame_buf + RXFRAME_ALIGN_SZ -
-       //                                              ((SIZE_PTR) (precvpriv->pallocated_frame_buf) &(RXFRAME_ALIGN_SZ-1));
+       /* precvpriv->precv_frame_buf = precvpriv->pallocated_frame_buf + RXFRAME_ALIGN_SZ - */
+       /*                                              ((SIZE_PTR) (precvpriv->pallocated_frame_buf) &(RXFRAME_ALIGN_SZ-1)); */
 
        precvframe = (union recv_frame*) precvpriv->precv_frame_buf;
 
 
-       for(i=0; i < NR_RECVFRAME ; i++)
+       for (i = 0; i < NR_RECVFRAME ; i++)
        {
                INIT_LIST_HEAD(&(precvframe->u.list));
 
@@ -100,49 +95,38 @@ _func_enter_;
 
        rtw_init_timer(&precvpriv->signal_stat_timer, padapter, rtw_signal_stat_timer_hdl);
 
-       precvpriv->signal_stat_sampling_interval = 2000; //ms
-       //precvpriv->signal_stat_converging_constant = 5000; //ms
+       precvpriv->signal_stat_sampling_interval = 2000; /* ms */
 
        rtw_set_signal_stat_timer(precvpriv);
 
 exit:
-
-_func_exit_;
-
        return res;
-
 }
 
 void _rtw_free_recv_priv (struct recv_priv *precvpriv)
 {
-       _adapter        *padapter = precvpriv->adapter;
-
-_func_enter_;
+       struct adapter  *padapter = precvpriv->adapter;
 
        rtw_free_uc_swdec_pending_queue(padapter);
 
        rtw_os_recv_resource_free(precvpriv);
 
-       if(precvpriv->pallocated_frame_buf) {
+       if (precvpriv->pallocated_frame_buf) {
                vfree(precvpriv->pallocated_frame_buf);
        }
 
        rtw_hal_free_recv_priv(padapter);
-
-_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;
-       _list   *plist, *phead;
-       _adapter *padapter;
+       struct list_head        *plist, *phead;
+       struct adapter *padapter;
        struct recv_priv *precvpriv;
-_func_enter_;
 
-       if(list_empty(&pfree_recv_queue->queue))
+       if (list_empty(&pfree_recv_queue->queue))
        {
                precvframe = NULL;
        }
@@ -155,23 +139,18 @@ _func_enter_;
                precvframe = LIST_CONTAINOR(plist, union recv_frame, u);
 
                list_del_init(&precvframe->u.hdr.list);
-               padapter=precvframe->u.hdr.adapter;
-               if(padapter !=NULL){
-                       precvpriv=&padapter->recvpriv;
-                       if(pfree_recv_queue == &precvpriv->free_recv_queue)
+               padapter =precvframe->u.hdr.adapter;
+               if (padapter != NULL) {
+                       precvpriv =&padapter->recvpriv;
+                       if (pfree_recv_queue == &precvpriv->free_recv_queue)
                                precvpriv->free_recvframe_cnt--;
                }
        }
-
-_func_exit_;
-
        return precvframe;
-
 }
 
-union recv_frame *rtw_alloc_recvframe (_queue *pfree_recv_queue)
+union recv_frame *rtw_alloc_recvframe (struct __queue *pfree_recv_queue)
 {
-       _irqL irqL;
        union recv_frame  *precvframe;
 
        spin_lock_bh(&pfree_recv_queue->lock);
@@ -183,14 +162,11 @@ union recv_frame *rtw_alloc_recvframe (_queue *pfree_recv_queue)
        return precvframe;
 }
 
-int rtw_free_recvframe(union recv_frame *precvframe, _queue *pfree_recv_queue)
+int rtw_free_recvframe(union recv_frame *precvframe, struct __queue *pfree_recv_queue)
 {
-       _irqL irqL;
-       _adapter *padapter=precvframe->u.hdr.adapter;
+       struct adapter *padapter =precvframe->u.hdr.adapter;
        struct recv_priv *precvpriv = &padapter->recvpriv;
 
-_func_enter_;
-
        rtw_os_free_recvframe(precvframe);
 
 
@@ -202,31 +178,24 @@ _func_enter_;
 
        list_add_tail(&(precvframe->u.hdr.list), get_list_head(pfree_recv_queue));
 
-       if(padapter !=NULL){
-               if(pfree_recv_queue == &precvpriv->free_recv_queue)
+       if (padapter != NULL) {
+               if (pfree_recv_queue == &precvpriv->free_recv_queue)
                                precvpriv->free_recvframe_cnt++;
        }
-
-      spin_unlock_bh(&pfree_recv_queue->lock);
-
-_func_exit_;
-
+       spin_unlock_bh(&pfree_recv_queue->lock);
        return _SUCCESS;
-
 }
 
 
 
 
-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;
+       struct adapter *padapter =precvframe->u.hdr.adapter;
        struct recv_priv *precvpriv = &padapter->recvpriv;
 
-_func_enter_;
-
-       //INIT_LIST_HEAD(&(precvframe->u.hdr.list));
+       /* INIT_LIST_HEAD(&(precvframe->u.hdr.list)); */
        list_del_init(&(precvframe->u.hdr.list));
 
 
@@ -236,28 +205,24 @@ _func_enter_;
                if (queue == &precvpriv->free_recv_queue)
                        precvpriv->free_recvframe_cnt++;
        }
-
-_func_exit_;
-
        return _SUCCESS;
 }
 
-sint rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue)
+sint rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *queue)
 {
        sint ret;
-       _irqL irqL;
 
-       //_spinlock(&pfree_recv_queue->lock);
+       /* _spinlock(&pfree_recv_queue->lock); */
        spin_lock_bh(&queue->lock);
        ret = _rtw_enqueue_recvframe(precvframe, queue);
-       //spin_unlock(&pfree_recv_queue->lock);
+       /* spin_unlock(&pfree_recv_queue->lock); */
        spin_unlock_bh(&queue->lock);
 
        return ret;
 }
 
 /*
-sint   rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue)
+sint   rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *queue)
 {
        return rtw_free_recvframe(precvframe, queue);
 }
@@ -274,39 +239,33 @@ using spinlock to protect
 
 */
 
-void rtw_free_recvframe_queue(_queue *pframequeue,  _queue *pfree_recv_queue)
+void rtw_free_recvframe_queue(struct __queue *pframequeue,  struct __queue *pfree_recv_queue)
 {
-       union   recv_frame      *precvframe;
-       _list   *plist, *phead;
+       union   recv_frame      *precvframe;
+       struct list_head        *plist, *phead;
 
-_func_enter_;
        spin_lock(&pframequeue->lock);
 
        phead = get_list_head(pframequeue);
        plist = get_next(phead);
 
-       while(phead != plist)
+       while (phead != plist)
        {
                precvframe = LIST_CONTAINOR(plist, union recv_frame, u);
 
                plist = get_next(plist);
 
-               //list_del_init(&precvframe->u.hdr.list); // will do this in rtw_free_recvframe()
-
                rtw_free_recvframe(precvframe, pfree_recv_queue);
        }
 
        spin_unlock(&pframequeue->lock);
-
-_func_exit_;
-
 }
 
-u32 rtw_free_uc_swdec_pending_queue(_adapter *adapter)
+u32 rtw_free_uc_swdec_pending_queue(struct adapter *adapter)
 {
        u32 cnt = 0;
        union recv_frame *pending_frame;
-       while((pending_frame=rtw_alloc_recvframe(&adapter->recvpriv.uc_swdec_pending_queue))) {
+       while ((pending_frame =rtw_alloc_recvframe(&adapter->recvpriv.uc_swdec_pending_queue))) {
                rtw_free_recvframe(pending_frame, &adapter->recvpriv.free_recv_queue);
                cnt++;
        }
@@ -318,10 +277,8 @@ 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)
 {
-       _irqL irqL;
-
        spin_lock_bh(&queue->lock);
 
        list_del_init(&precvbuf->list);
@@ -332,9 +289,8 @@ sint rtw_enqueue_recvbuf_to_head(struct recv_buf *precvbuf, _queue *queue)
        return _SUCCESS;
 }
 
-sint rtw_enqueue_recvbuf(struct recv_buf *precvbuf, _queue *queue)
+sint rtw_enqueue_recvbuf(struct recv_buf *precvbuf, struct __queue *queue)
 {
-       _irqL irqL;
        spin_lock_bh(&queue->lock);
 
        list_del_init(&precvbuf->list);
@@ -345,15 +301,14 @@ sint rtw_enqueue_recvbuf(struct recv_buf *precvbuf, _queue *queue)
 
 }
 
-struct recv_buf *rtw_dequeue_recvbuf (_queue *queue)
+struct recv_buf *rtw_dequeue_recvbuf (struct __queue *queue)
 {
-       _irqL irqL;
        struct recv_buf *precvbuf;
-       _list   *plist, *phead;
+       struct list_head        *plist, *phead;
 
        spin_lock_bh(&queue->lock);
 
-       if(list_empty(&queue->queue))
+       if (list_empty(&queue->queue))
        {
                precvbuf = NULL;
        }
@@ -375,138 +330,136 @@ struct recv_buf *rtw_dequeue_recvbuf (_queue *queue)
 
 }
 
-sint recvframe_chkmic(_adapter *adapter,  union recv_frame *precvframe);
-sint recvframe_chkmic(_adapter *adapter,  union recv_frame *precvframe){
+sint recvframe_chkmic(struct adapter *adapter,  union recv_frame *precvframe);
+sint recvframe_chkmic(struct adapter *adapter,  union recv_frame *precvframe) {
 
-       sint    i,res=_SUCCESS;
-       u32     datalen;
-       u8      miccode[8];
-       u8      bmic_err=false,brpt_micerror = true;
-       u8      *pframe, *payload,*pframemic;
-       u8      *mickey;
-       //u8    *iv,rxdata_key_idx=0;
-       struct  sta_info                *stainfo;
-       struct  rx_pkt_attrib   *prxattrib=&precvframe->u.hdr.attrib;
-       struct  security_priv   *psecuritypriv=&adapter->securitypriv;
+       sint    i, res = _SUCCESS;
+       u32 datalen;
+       u8 miccode[8];
+       u8 bmic_err =false, brpt_micerror = true;
+       u8 *pframe, *payload,*pframemic;
+       u8 *mickey;
+       /* u8 *iv, rxdata_key_idx = 0; */
+       struct  sta_info        *stainfo;
+       struct  rx_pkt_attrib   *prxattrib =&precvframe->u.hdr.attrib;
+       struct  security_priv *psecuritypriv =&adapter->securitypriv;
 
-       struct mlme_ext_priv    *pmlmeext = &adapter->mlmeextpriv;
-       struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
-_func_enter_;
+       struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv;
+       struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
 
-       stainfo=rtw_get_stainfo(&adapter->stapriv ,&prxattrib->ta[0]);
+       stainfo =rtw_get_stainfo(&adapter->stapriv ,&prxattrib->ta[0]);
 
-       if(prxattrib->encrypt ==_TKIP_)
+       if (prxattrib->encrypt == _TKIP_)
        {
-               RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("\n recvframe_chkmic:prxattrib->encrypt ==_TKIP_\n"));
-               RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("\n recvframe_chkmic:da=0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n",
-                       prxattrib->ra[0],prxattrib->ra[1],prxattrib->ra[2],prxattrib->ra[3],prxattrib->ra[4],prxattrib->ra[5]));
+               RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("\n recvframe_chkmic:prxattrib->encrypt == _TKIP_\n"));
+               RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("\n recvframe_chkmic:da = 0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n",
+                       prxattrib->ra[0], prxattrib->ra[1], prxattrib->ra[2], prxattrib->ra[3], prxattrib->ra[4], prxattrib->ra[5]));
 
-               //calculate mic code
-               if(stainfo!= NULL)
+               /* calculate mic code */
+               if (stainfo!= NULL)
                {
-                       if(IS_MCAST(prxattrib->ra))
+                       if (IS_MCAST(prxattrib->ra))
                        {
-                               //mickey=&psecuritypriv->dot118021XGrprxmickey.skey[0];
-                               //iv = precvframe->u.hdr.rx_data+prxattrib->hdrlen;
-                               //rxdata_key_idx =( ((iv[3])>>6)&0x3) ;
-                               mickey=&psecuritypriv->dot118021XGrprxmickey[prxattrib->key_index].skey[0];
+                               /* mickey =&psecuritypriv->dot118021XGrprxmickey.skey[0]; */
+                               /* iv = precvframe->u.hdr.rx_data+prxattrib->hdrlen; */
+                               /* rxdata_key_idx =(((iv[3])>>6)&0x3) ; */
+                               mickey =&psecuritypriv->dot118021XGrprxmickey[prxattrib->key_index].skey[0];
 
-                               RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("\n recvframe_chkmic: bcmc key \n"));
-                               //DBG_871X("\n recvframe_chkmic: bcmc key psecuritypriv->dot118021XGrpKeyid(%d),pmlmeinfo->key_index(%d) ,recv key_id(%d)\n",
-                               //                                                              psecuritypriv->dot118021XGrpKeyid,pmlmeinfo->key_index,rxdata_key_idx);
+                               RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("\n recvframe_chkmic: bcmc key\n"));
+                               /* DBG_871X("\n recvframe_chkmic: bcmc key psecuritypriv->dot118021XGrpKeyid(%d), pmlmeinfo->key_index(%d) , recv key_id(%d)\n", */
+                               /*                                                              psecuritypriv->dot118021XGrpKeyid, pmlmeinfo->key_index, rxdata_key_idx); */
 
-                               if(psecuritypriv->binstallGrpkey==false)
+                               if (psecuritypriv->binstallGrpkey ==false)
                                {
-                                       res=_FAIL;
-                                       RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n recvframe_chkmic:didn't install group key!!!!!!!!!!\n"));
+                                       res = _FAIL;
+                                       RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("\n recvframe_chkmic:didn't install group key!!!!!!!!!!\n"));
                                        DBG_871X("\n recvframe_chkmic:didn't install group key!!!!!!!!!!\n");
                                        goto exit;
                                }
                        }
-                       else{
-                               mickey=&stainfo->dot11tkiprxmickey.skey[0];
-                               RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n recvframe_chkmic: unicast key \n"));
+                       else {
+                               mickey =&stainfo->dot11tkiprxmickey.skey[0];
+                               RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("\n recvframe_chkmic: unicast key\n"));
                        }
 
-                       datalen=precvframe->u.hdr.len-prxattrib->hdrlen-prxattrib->iv_len-prxattrib->icv_len-8;//icv_len included the mic code
-                       pframe=precvframe->u.hdr.rx_data;
-                       payload=pframe+prxattrib->hdrlen+prxattrib->iv_len;
+                       datalen =precvframe->u.hdr.len-prxattrib->hdrlen-prxattrib->iv_len-prxattrib->icv_len-8;/* icv_len included the mic code */
+                       pframe =precvframe->u.hdr.rx_data;
+                       payload =pframe+prxattrib->hdrlen+prxattrib->iv_len;
 
-                       RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("\n prxattrib->iv_len=%d prxattrib->icv_len=%d\n",prxattrib->iv_len,prxattrib->icv_len));
+                       RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("\n prxattrib->iv_len =%d prxattrib->icv_len =%d\n", prxattrib->iv_len, prxattrib->icv_len));
 
-                       //rtw_seccalctkipmic(&stainfo->dot11tkiprxmickey.skey[0],pframe,payload, datalen ,&miccode[0],(unsigned char)prxattrib->priority); //care the length of the data
 
-                       rtw_seccalctkipmic(mickey,pframe,payload, datalen ,&miccode[0],(unsigned char)prxattrib->priority); //care the length of the data
+                       rtw_seccalctkipmic(mickey, pframe, payload, datalen ,&miccode[0], (unsigned char)prxattrib->priority); /* care the length of the data */
 
-                       pframemic=payload+datalen;
+                       pframemic =payload+datalen;
 
-                       bmic_err=false;
+                       bmic_err =false;
 
-                       for(i=0;i<8;i++){
-                               if(miccode[i] != *(pframemic+i)){
-                                       RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvframe_chkmic:miccode[%d](%02x) != *(pframemic+%d)(%02x) ",i,miccode[i],i,*(pframemic+i)));
-                                       bmic_err=true;
+                       for (i = 0;i<8;i++) {
+                               if (miccode[i] != *(pframemic+i)) {
+                                       RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("recvframe_chkmic:miccode[%d](%02x) != *(pframemic+%d)(%02x) ", i, miccode[i], i,*(pframemic+i)));
+                                       bmic_err =true;
                                }
                        }
 
 
-                       if(bmic_err==true){
+                       if (bmic_err ==true) {
 
-                               RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n *(pframemic-8)-*(pframemic-1)=0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n",
+                               RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("\n *(pframemic-8)-*(pframemic-1) = 0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n",
                                        *(pframemic-8),*(pframemic-7),*(pframemic-6),*(pframemic-5),*(pframemic-4),*(pframemic-3),*(pframemic-2),*(pframemic-1)));
-                               RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n *(pframemic-16)-*(pframemic-9)=0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n",
+                               RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("\n *(pframemic-16)-*(pframemic-9) = 0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n",
                                        *(pframemic-16),*(pframemic-15),*(pframemic-14),*(pframemic-13),*(pframemic-12),*(pframemic-11),*(pframemic-10),*(pframemic-9)));
 
                                {
                                        uint i;
-                                       RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n ======demp packet (len=%d)======\n",precvframe->u.hdr.len));
-                                       for(i=0;i<precvframe->u.hdr.len;i=i+8){
-                                               RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x",
+                                       RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("\n ======demp packet (len =%d) ======\n", precvframe->u.hdr.len));
+                                       for (i = 0;i<precvframe->u.hdr.len;i =i+8) {
+                                               RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x",
                                                        *(precvframe->u.hdr.rx_data+i),*(precvframe->u.hdr.rx_data+i+1),
                                                        *(precvframe->u.hdr.rx_data+i+2),*(precvframe->u.hdr.rx_data+i+3),
                                                        *(precvframe->u.hdr.rx_data+i+4),*(precvframe->u.hdr.rx_data+i+5),
                                                        *(precvframe->u.hdr.rx_data+i+6),*(precvframe->u.hdr.rx_data+i+7)));
                                        }
-                                       RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n ======demp packet end [len=%d]======\n",precvframe->u.hdr.len));
-                                       RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n hrdlen=%d, \n",prxattrib->hdrlen));
+                                       RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("\n ======demp packet end [len =%d]======\n", precvframe->u.hdr.len));
+                                       RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("\n hrdlen =%d,\n", prxattrib->hdrlen));
                                }
 
-                               RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("ra=0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x psecuritypriv->binstallGrpkey=%d ",
-                                       prxattrib->ra[0],prxattrib->ra[1],prxattrib->ra[2],
-                                       prxattrib->ra[3],prxattrib->ra[4],prxattrib->ra[5],psecuritypriv->binstallGrpkey));
+                               RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("ra = 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x 0x%.2x psecuritypriv->binstallGrpkey =%d ",
+                                       prxattrib->ra[0], prxattrib->ra[1], prxattrib->ra[2],
+                                       prxattrib->ra[3], prxattrib->ra[4], prxattrib->ra[5], psecuritypriv->binstallGrpkey));
 
-                               // double check key_index for some timing issue ,
-                               // cannot compare with psecuritypriv->dot118021XGrpKeyid also cause timing issue
-                               if((IS_MCAST(prxattrib->ra)==true)  && (prxattrib->key_index != pmlmeinfo->key_index ))
+                               /*  double check key_index for some timing issue , */
+                               /*  cannot compare with psecuritypriv->dot118021XGrpKeyid also cause timing issue */
+                               if ((IS_MCAST(prxattrib->ra) ==true)  && (prxattrib->key_index != pmlmeinfo->key_index))
                                        brpt_micerror = false;
 
-                               if((prxattrib->bdecrypted ==true)&& (brpt_micerror == true))
+                               if ((prxattrib->bdecrypted ==true) && (brpt_micerror == true))
                                {
-                                       rtw_handle_tkip_mic_err(adapter,(u8)IS_MCAST(prxattrib->ra));
-                                       RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" mic error :prxattrib->bdecrypted=%d ",prxattrib->bdecrypted));
-                                       DBG_871X(" mic error :prxattrib->bdecrypted=%d\n",prxattrib->bdecrypted);
+                                       rtw_handle_tkip_mic_err(adapter, (u8)IS_MCAST(prxattrib->ra));
+                                       RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, (" mic error :prxattrib->bdecrypted =%d ", prxattrib->bdecrypted));
+                                       DBG_871X(" mic error :prxattrib->bdecrypted =%d\n", prxattrib->bdecrypted);
                                }
                                else
                                {
-                                       RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" mic error :prxattrib->bdecrypted=%d ",prxattrib->bdecrypted));
-                                       DBG_871X(" mic error :prxattrib->bdecrypted=%d\n",prxattrib->bdecrypted);
+                                       RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, (" mic error :prxattrib->bdecrypted =%d ", prxattrib->bdecrypted));
+                                       DBG_871X(" mic error :prxattrib->bdecrypted =%d\n", prxattrib->bdecrypted);
                                }
 
-                               res=_FAIL;
+                               res = _FAIL;
 
                        }
-                       else{
-                               //mic checked ok
-                               if((psecuritypriv->bcheck_grpkey ==false)&&(IS_MCAST(prxattrib->ra)==true)){
+                       else {
+                               /* mic checked ok */
+                               if ((psecuritypriv->bcheck_grpkey ==false) && (IS_MCAST(prxattrib->ra) ==true)) {
                                        psecuritypriv->bcheck_grpkey =true;
-                                       RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("psecuritypriv->bcheck_grpkey =true"));
+                                       RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("psecuritypriv->bcheck_grpkey =true"));
                                }
                        }
 
                }
                else
                {
-                       RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvframe_chkmic: rtw_get_stainfo==NULL!!!\n"));
+                       RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("recvframe_chkmic: rtw_get_stainfo == NULL!!!\n"));
                }
 
                recvframe_pull_tail(precvframe, 8);
@@ -514,39 +467,34 @@ _func_enter_;
        }
 
 exit:
-
-_func_exit_;
-
        return res;
 
 }
 
-//decrypt and set the ivlen,icvlen of the recv_frame
-union recv_frame * decryptor(_adapter *padapter,union recv_frame *precv_frame);
-union recv_frame * decryptor(_adapter *padapter,union recv_frame *precv_frame)
+/* decrypt and set the ivlen, icvlen of the recv_frame */
+union recv_frame * decryptor(struct adapter *padapter, union recv_frame *precv_frame);
+union recv_frame * decryptor(struct adapter *padapter, union recv_frame *precv_frame)
 {
 
        struct rx_pkt_attrib *prxattrib = &precv_frame->u.hdr.attrib;
-       struct security_priv *psecuritypriv=&padapter->securitypriv;
-       union recv_frame *return_packet=precv_frame;
-       u32      res=_SUCCESS;
-
-_func_enter_;
+       struct security_priv *psecuritypriv =&padapter->securitypriv;
+       union recv_frame *return_packet =precv_frame;
+       u32  res = _SUCCESS;
 
        DBG_COUNTER(padapter->rx_logs.core_rx_post_decrypt);
 
-       RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("prxstat->decrypted=%x prxattrib->encrypt = 0x%03x\n",prxattrib->bdecrypted,prxattrib->encrypt));
+       RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("prxstat->decrypted =%x prxattrib->encrypt = 0x%03x\n", prxattrib->bdecrypted, prxattrib->encrypt));
 
-       if(prxattrib->encrypt>0)
+       if (prxattrib->encrypt>0)
        {
                u8 *iv = precv_frame->u.hdr.rx_data+prxattrib->hdrlen;
-               prxattrib->key_index = ( ((iv[3])>>6)&0x3) ;
+               prxattrib->key_index = (((iv[3])>>6)&0x3) ;
 
-               if(prxattrib->key_index > WEP_KEYS)
+               if (prxattrib->key_index > WEP_KEYS)
                {
-                       DBG_871X("prxattrib->key_index(%d) > WEP_KEYS \n", prxattrib->key_index);
+                       DBG_871X("prxattrib->key_index(%d) > WEP_KEYS\n", prxattrib->key_index);
 
-                       switch(prxattrib->encrypt){
+                       switch (prxattrib->encrypt) {
                                case _WEP40_:
                                case _WEP104_:
                                        prxattrib->key_index = psecuritypriv->dot11PrivacyKeyIndex;
@@ -560,20 +508,20 @@ _func_enter_;
                }
        }
 
-       if((prxattrib->encrypt>0) && ((prxattrib->bdecrypted==0) ||(psecuritypriv->sw_decrypt==true)))
+       if ((prxattrib->encrypt>0) && ((prxattrib->bdecrypted == 0) ||(psecuritypriv->sw_decrypt ==true)))
        {
-               psecuritypriv->hw_decrypted=false;
+               psecuritypriv->hw_decrypted =false;
 
                #ifdef DBG_RX_DECRYPTOR
                DBG_871X("[%s] %d:prxstat->bdecrypted:%d,  prxattrib->encrypt:%d,  Setting psecuritypriv->hw_decrypted = %d\n",
-                       __FUNCTION__,
+                       __func__,
                        __LINE__,
                        prxattrib->bdecrypted,
                        prxattrib->encrypt,
                        psecuritypriv->hw_decrypted);
                #endif
 
-               switch(prxattrib->encrypt){
+               switch (prxattrib->encrypt) {
                case _WEP40_:
                case _WEP104_:
                        DBG_COUNTER(padapter->rx_logs.core_rx_post_decrypt_wep);
@@ -585,23 +533,23 @@ _func_enter_;
                        break;
                case _AES_:
                        DBG_COUNTER(padapter->rx_logs.core_rx_post_decrypt_aes);
-                       res = rtw_aes_decrypt(padapter, (u8 * )precv_frame);
+                       res = rtw_aes_decrypt(padapter, (u8 *)precv_frame);
                        break;
                default:
                                break;
                }
        }
-       else if(prxattrib->bdecrypted==1
+       else if (prxattrib->bdecrypted == 1
                && prxattrib->encrypt >0
-               && (psecuritypriv->busetkipkey==1 || prxattrib->encrypt !=_TKIP_ )
+               && (psecuritypriv->busetkipkey == 1 || prxattrib->encrypt != _TKIP_)
                )
        {
                DBG_COUNTER(padapter->rx_logs.core_rx_post_decrypt_hw);
 
-               psecuritypriv->hw_decrypted=true;
+               psecuritypriv->hw_decrypted =true;
                #ifdef DBG_RX_DECRYPTOR
                DBG_871X("[%s] %d:prxstat->bdecrypted:%d,  prxattrib->encrypt:%d,  Setting psecuritypriv->hw_decrypted = %d\n",
-                       __FUNCTION__,
+                       __func__,
                        __LINE__,
                        prxattrib->bdecrypted,
                        prxattrib->encrypt,
@@ -613,7 +561,7 @@ _func_enter_;
                DBG_COUNTER(padapter->rx_logs.core_rx_post_decrypt_unknown);
                #ifdef DBG_RX_DECRYPTOR
                DBG_871X("[%s] %d:prxstat->bdecrypted:%d,  prxattrib->encrypt:%d,  Setting psecuritypriv->hw_decrypted = %d\n",
-                       __FUNCTION__,
+                       __func__,
                        __LINE__,
                        prxattrib->bdecrypted,
                        prxattrib->encrypt,
@@ -621,7 +569,7 @@ _func_enter_;
                #endif
        }
 
-       if(res == _FAIL)
+       if (res == _FAIL)
        {
                rtw_free_recvframe(return_packet,&padapter->recvpriv.free_recv_queue);
                return_packet = NULL;
@@ -630,16 +578,13 @@ _func_enter_;
        {
                prxattrib->bdecrypted = true;
        }
-       //recvframe_chkmic(adapter, precv_frame);   //move to recvframme_defrag function
-
-_func_exit_;
 
        return return_packet;
-
 }
-//###set the security information in the recv_frame
-union recv_frame * portctrl(_adapter *adapter,union recv_frame * precv_frame);
-union recv_frame * portctrl(_adapter *adapter,union recv_frame * precv_frame)
+
+/* set the security information in the recv_frame */
+union recv_frame * portctrl(struct adapter *adapter, union recv_frame * precv_frame);
+union recv_frame * portctrl(struct adapter *adapter, union recv_frame * precv_frame)
 {
        u8 *psta_addr = NULL;
        u8 *ptr;
@@ -648,12 +593,10 @@ union recv_frame * portctrl(_adapter *adapter,union recv_frame * precv_frame)
        struct sta_info *psta;
        struct sta_priv *pstapriv ;
        union recv_frame *prtnframe;
-       u16     ether_type=0;
-       u16  eapol_type = 0x888e;//for Funia BD's WPA issue
+       u16 ether_type = 0;
+       u16  eapol_type = 0x888e;/* for Funia BD's WPA issue */
        struct rx_pkt_attrib *pattrib;
 
-_func_enter_;
-
        pstapriv = &adapter->stapriv;
 
        auth_alg = adapter->securitypriv.dot11AuthAlgrthm;
@@ -667,66 +610,64 @@ _func_enter_;
 
        psta = rtw_get_stainfo(pstapriv, psta_addr);
 
-       RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("########portctrl:adapter->securitypriv.dot11AuthAlgrthm=%d\n",adapter->securitypriv.dot11AuthAlgrthm));
+       RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("########portctrl:adapter->securitypriv.dot11AuthAlgrthm =%d\n", adapter->securitypriv.dot11AuthAlgrthm));
 
-       if(auth_alg==2)
+       if (auth_alg ==2)
        {
-               if ((psta!=NULL) && (psta->ieee8021x_blocked))
+               if ((psta!= NULL) && (psta->ieee8021x_blocked))
                {
-                       //blocked
-                       //only accept EAPOL frame
-                       RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("########portctrl:psta->ieee8021x_blocked==1\n"));
+                       __be16 be_tmp;
+
+                       /* blocked */
+                       /* only accept EAPOL frame */
+                       RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("########portctrl:psta->ieee8021x_blocked == 1\n"));
 
-                       prtnframe=precv_frame;
+                       prtnframe =precv_frame;
 
-                       //get ether_type
-                       ptr=ptr+pfhdr->attrib.hdrlen+pfhdr->attrib.iv_len+LLC_HEADER_SIZE;
-                       memcpy(&ether_type,ptr, 2);
-                       ether_type= ntohs((unsigned short )ether_type);
+                       /* get ether_type */
+                       ptr =ptr+pfhdr->attrib.hdrlen+pfhdr->attrib.iv_len+LLC_HEADER_SIZE;
+                       memcpy(&be_tmp, ptr, 2);
+                       ether_type = ntohs(be_tmp);
 
                        if (ether_type == eapol_type) {
-                               prtnframe=precv_frame;
+                               prtnframe =precv_frame;
                        }
                        else {
-                               //free this frame
+                               /* free this frame */
                                rtw_free_recvframe(precv_frame, &adapter->recvpriv.free_recv_queue);
-                               prtnframe=NULL;
+                               prtnframe = NULL;
                        }
                }
                else
                {
-                       //allowed
-                       //check decryption status, and decrypt the frame if needed
-                       RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("########portctrl:psta->ieee8021x_blocked==0\n"));
-                       RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("portctrl:precv_frame->hdr.attrib.privacy=%x\n",precv_frame->u.hdr.attrib.privacy));
+                       /* allowed */
+                       /* check decryption status, and decrypt the frame if needed */
+                       RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("########portctrl:psta->ieee8021x_blocked == 0\n"));
+                       RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("portctrl:precv_frame->hdr.attrib.privacy =%x\n", precv_frame->u.hdr.attrib.privacy));
 
                        if (pattrib->bdecrypted == 0)
                        {
-                               RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("portctrl:prxstat->decrypted=%x\n", pattrib->bdecrypted));
+                               RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("portctrl:prxstat->decrypted =%x\n", pattrib->bdecrypted));
                        }
 
-                       prtnframe=precv_frame;
-                       //check is the EAPOL frame or not (Rekey)
-                       //if(ether_type == eapol_type){
-                       //      RT_TRACE(_module_rtl871x_recv_c_,_drv_notice_,("########portctrl:ether_type == 0x888e\n"));
-                               //check Rekey
+                       prtnframe =precv_frame;
+                       /* check is the EAPOL frame or not (Rekey) */
+                       /* if (ether_type == eapol_type) { */
+                       /*      RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("########portctrl:ether_type == 0x888e\n")); */
+                               /* check Rekey */
 
-                       //      prtnframe=precv_frame;
-                       //}
-                       //else{
-                       //      RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("########portctrl:ether_type=0x%04x\n", ether_type));
-                       //}
+                       /*      prtnframe =precv_frame; */
+                       /*  */
+                       /* else { */
+                       /*      RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("########portctrl:ether_type = 0x%04x\n", ether_type)); */
+                       /*  */
                }
        }
        else
        {
-               prtnframe=precv_frame;
+               prtnframe =precv_frame;
        }
-
-_func_exit_;
-
-               return prtnframe;
-
+       return prtnframe;
 }
 
 sint recv_decache(union recv_frame *precv_frame, u8 bretry, struct stainfo_rxcache *prxcache);
@@ -734,23 +675,21 @@ sint recv_decache(union recv_frame *precv_frame, u8 bretry, struct stainfo_rxcac
 {
        sint tid = precv_frame->u.hdr.attrib.priority;
 
-       u16 seq_ctrl = ( (precv_frame->u.hdr.attrib.seq_num&0xffff) << 4) |
+       u16 seq_ctrl = ((precv_frame->u.hdr.attrib.seq_num&0xffff) << 4) |
                (precv_frame->u.hdr.attrib.frag_num & 0xf);
 
-_func_enter_;
-
-       if(tid>15)
+       if (tid>15)
        {
-               RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("recv_decache, (tid>15)! seq_ctrl=0x%x, tid=0x%x\n", seq_ctrl, tid));
+               RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("recv_decache, (tid>15)! seq_ctrl = 0x%x, tid = 0x%x\n", seq_ctrl, tid));
 
                return _FAIL;
        }
 
-       if(1)//if(bretry)
+       if (1)/* if (bretry) */
        {
-               if(seq_ctrl == prxcache->tid_rxseq[tid])
+               if (seq_ctrl == prxcache->tid_rxseq[tid])
                {
-                       RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("recv_decache, seq_ctrl=0x%x, tid=0x%x, tid_rxseq=0x%x\n", seq_ctrl, tid, prxcache->tid_rxseq[tid]));
+                       RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("recv_decache, seq_ctrl = 0x%x, tid = 0x%x, tid_rxseq = 0x%x\n", seq_ctrl, tid, prxcache->tid_rxseq[tid]));
 
                        return _FAIL;
                }
@@ -758,77 +697,75 @@ _func_enter_;
 
        prxcache->tid_rxseq[tid] = seq_ctrl;
 
-_func_exit_;
-
        return _SUCCESS;
 
 }
 
-void process_pwrbit_data(_adapter *padapter, union recv_frame *precv_frame);
-void process_pwrbit_data(_adapter *padapter, union recv_frame *precv_frame)
+void process_pwrbit_data(struct adapter *padapter, union recv_frame *precv_frame);
+void process_pwrbit_data(struct adapter *padapter, union recv_frame *precv_frame)
 {
        unsigned char pwrbit;
        u8 *ptr = precv_frame->u.hdr.rx_data;
        struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
        struct sta_priv *pstapriv = &padapter->stapriv;
-       struct sta_info *psta=NULL;
+       struct sta_info *psta = NULL;
 
        psta = rtw_get_stainfo(pstapriv, pattrib->src);
 
        pwrbit = GetPwrMgt(ptr);
 
-       if(psta)
+       if (psta)
        {
-               if(pwrbit)
+               if (pwrbit)
                {
-                       if(!(psta->state & WIFI_SLEEP_STATE))
+                       if (!(psta->state & WIFI_SLEEP_STATE))
                        {
-                               //psta->state |= WIFI_SLEEP_STATE;
-                               //pstapriv->sta_dz_bitmap |= BIT(psta->aid);
+                               /* psta->state |= WIFI_SLEEP_STATE; */
+                               /* pstapriv->sta_dz_bitmap |= BIT(psta->aid); */
 
                                stop_sta_xmit(padapter, psta);
 
-                               //DBG_871X("to sleep, sta_dz_bitmap=%x\n", pstapriv->sta_dz_bitmap);
+                               /* DBG_871X("to sleep, sta_dz_bitmap =%x\n", pstapriv->sta_dz_bitmap); */
                        }
                }
                else
                {
-                       if(psta->state & WIFI_SLEEP_STATE)
+                       if (psta->state & WIFI_SLEEP_STATE)
                        {
-                               //psta->state ^= WIFI_SLEEP_STATE;
-                               //pstapriv->sta_dz_bitmap &= ~BIT(psta->aid);
+                               /* psta->state ^= WIFI_SLEEP_STATE; */
+                               /* pstapriv->sta_dz_bitmap &= ~BIT(psta->aid); */
 
                                wakeup_sta_to_xmit(padapter, psta);
 
-                               //DBG_871X("to wakeup, sta_dz_bitmap=%x\n", pstapriv->sta_dz_bitmap);
+                               /* DBG_871X("to wakeup, sta_dz_bitmap =%x\n", pstapriv->sta_dz_bitmap); */
                        }
                }
 
        }
 }
 
-void process_wmmps_data(_adapter *padapter, union recv_frame *precv_frame);
-void process_wmmps_data(_adapter *padapter, union recv_frame *precv_frame)
+void process_wmmps_data(struct adapter *padapter, union recv_frame *precv_frame);
+void process_wmmps_data(struct adapter *padapter, union recv_frame *precv_frame)
 {
        struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
        struct sta_priv *pstapriv = &padapter->stapriv;
-       struct sta_info *psta=NULL;
+       struct sta_info *psta = NULL;
 
        psta = rtw_get_stainfo(pstapriv, pattrib->src);
 
-       if(!psta) return;
+       if (!psta) return;
 
-       if(!psta->qos_option)
+       if (!psta->qos_option)
                return;
 
-       if(!(psta->qos_info&0xf))
+       if (!(psta->qos_info&0xf))
                return;
 
-       if(psta->state&WIFI_SLEEP_STATE)
+       if (psta->state&WIFI_SLEEP_STATE)
        {
-               u8 wmmps_ac=0;
+               u8 wmmps_ac = 0;
 
-               switch(pattrib->priority)
+               switch (pattrib->priority)
                {
                        case 1:
                        case 2:
@@ -849,46 +786,46 @@ void process_wmmps_data(_adapter *padapter, union recv_frame *precv_frame)
                                break;
                }
 
-               if(wmmps_ac)
+               if (wmmps_ac)
                {
-                       if(psta->sleepq_ac_len>0)
+                       if (psta->sleepq_ac_len>0)
                        {
-                               //process received triggered frame
+                               /* process received triggered frame */
                                xmit_delivery_enabled_frames(padapter, psta);
                        }
                        else
                        {
-                               //issue one qos null frame with More data bit = 0 and the EOSP bit set (=1)
+                               /* issue one qos null frame with More data bit = 0 and the EOSP bit set (= 1) */
                                issue_qos_nulldata(padapter, psta->hwaddr, (u16)pattrib->priority, 0, 0);
                        }
                }
        }
 }
 
-void count_rx_stats(_adapter *padapter, union recv_frame *prframe, struct sta_info*sta);
-void count_rx_stats(_adapter *padapter, union recv_frame *prframe, struct sta_info*sta)
+void count_rx_stats(struct adapter *padapter, union recv_frame *prframe, struct sta_info*sta);
+void count_rx_stats(struct adapter *padapter, union recv_frame *prframe, struct sta_info*sta)
 {
        int     sz;
-       struct sta_info         *psta = NULL;
+       struct sta_info         *psta = NULL;
        struct stainfo_stats    *pstats = NULL;
        struct rx_pkt_attrib    *pattrib = & prframe->u.hdr.attrib;
-       struct recv_priv                *precvpriv = &padapter->recvpriv;
+       struct recv_priv        *precvpriv = &padapter->recvpriv;
 
        sz = get_recvframe_len(prframe);
        precvpriv->rx_bytes += sz;
 
        padapter->mlmepriv.LinkDetectInfo.NumRxOkInPeriod++;
 
-       if( (!MacAddr_isBcst(pattrib->dst)) && (!IS_MCAST(pattrib->dst))){
+       if ((!MacAddr_isBcst(pattrib->dst)) && (!IS_MCAST(pattrib->dst))) {
                padapter->mlmepriv.LinkDetectInfo.NumRxUnicastOkInPeriod++;
        }
 
-       if(sta)
+       if (sta)
                psta = sta;
        else
                psta = prframe->u.hdr.psta;
 
-       if(psta)
+       if (psta)
        {
                pstats = &psta->sta_stats;
 
@@ -900,12 +837,12 @@ void count_rx_stats(_adapter *padapter, union recv_frame *prframe, struct sta_in
 }
 
 sint sta2sta_data_frame(
-       _adapter *adapter,
+       struct adapter *adapter,
        union recv_frame *precv_frame,
        struct sta_info**psta
 );
 sint sta2sta_data_frame(
-       _adapter *adapter,
+       struct adapter *adapter,
        union recv_frame *precv_frame,
        struct sta_info**psta
 )
@@ -913,51 +850,49 @@ sint sta2sta_data_frame(
        u8 *ptr = precv_frame->u.hdr.rx_data;
        sint ret = _SUCCESS;
        struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib;
-       struct  sta_priv                *pstapriv = &adapter->stapriv;
-       struct  mlme_priv       *pmlmepriv = &adapter->mlmepriv;
+       struct  sta_priv        *pstapriv = &adapter->stapriv;
+       struct  mlme_priv *pmlmepriv = &adapter->mlmepriv;
        u8 *mybssid  = get_bssid(pmlmepriv);
        u8 *myhwaddr = myid(&adapter->eeprompriv);
        u8 * sta_addr = NULL;
        sint bmcast = IS_MCAST(pattrib->dst);
 
-_func_enter_;
-
-       //DBG_871X("[%s] %d, seqnum:%d\n", __FUNCTION__, __LINE__, pattrib->seq_num);
+       /* DBG_871X("[%s] %d, seqnum:%d\n", __func__, __LINE__, pattrib->seq_num); */
 
        if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true) ||
                (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true))
        {
 
-               // filter packets that SA is myself or multicast or broadcast
-               if (!memcmp(myhwaddr, pattrib->src, ETH_ALEN)){
-                       RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" SA==myself \n"));
-                       ret= _FAIL;
+               /*  filter packets that SA is myself or multicast or broadcast */
+               if (!memcmp(myhwaddr, pattrib->src, ETH_ALEN)) {
+                       RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, (" SA ==myself\n"));
+                       ret = _FAIL;
                        goto exit;
                }
 
-               if( (memcmp(myhwaddr, pattrib->dst, ETH_ALEN))  && (!bmcast) ){
-                       ret= _FAIL;
+               if ((memcmp(myhwaddr, pattrib->dst, ETH_ALEN))  && (!bmcast)) {
+                       ret = _FAIL;
                        goto exit;
                }
 
-               if!memcmp(pattrib->bssid, "\x0\x0\x0\x0\x0\x0", ETH_ALEN) ||
+               if (!memcmp(pattrib->bssid, "\x0\x0\x0\x0\x0\x0", ETH_ALEN) ||
                   !memcmp(mybssid, "\x0\x0\x0\x0\x0\x0", ETH_ALEN) ||
-                  (memcmp(pattrib->bssid, mybssid, ETH_ALEN)) ) {
-                       ret= _FAIL;
+                  (memcmp(pattrib->bssid, mybssid, ETH_ALEN))) {
+                       ret = _FAIL;
                        goto exit;
                }
 
                sta_addr = pattrib->src;
 
        }
-       else if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true)
+       else if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true)
        {
                {
-                       // For Station mode, sa and bssid should always be BSSID, and DA is my mac-address
-                       if(memcmp(pattrib->bssid, pattrib->src, ETH_ALEN) )
+                       /*  For Station mode, sa and bssid should always be BSSID, and DA is my mac-address */
+                       if (memcmp(pattrib->bssid, pattrib->src, ETH_ALEN))
                        {
-                               RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("bssid != TA under STATION_MODE; drop pkt\n"));
-                               ret= _FAIL;
+                               RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("bssid != TA under STATION_MODE; drop pkt\n"));
+                               ret = _FAIL;
                                goto exit;
                }
 
@@ -965,21 +900,21 @@ _func_enter_;
                }
 
        }
-       else if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
+       else if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
        {
                if (bmcast)
                {
-                       // For AP mode, if DA == MCAST, then BSSID should be also MCAST
-                       if (!IS_MCAST(pattrib->bssid)){
-                                       ret= _FAIL;
+                       /*  For AP mode, if DA == MCAST, then BSSID should be also MCAST */
+                       if (!IS_MCAST(pattrib->bssid)) {
+                                       ret = _FAIL;
                                        goto exit;
                        }
                }
-               else // not mc-frame
+               else /*  not mc-frame */
                {
-                       // For AP mode, if DA is non-MCAST, then it must be BSSID, and bssid == BSSID
-                       if(memcmp(pattrib->bssid, pattrib->dst, ETH_ALEN)) {
-                               ret= _FAIL;
+                       /*  For AP mode, if DA is non-MCAST, then it must be BSSID, and bssid == BSSID */
+                       if (memcmp(pattrib->bssid, pattrib->dst, ETH_ALEN)) {
+                               ret = _FAIL;
                                goto exit;
                        }
 
@@ -987,7 +922,7 @@ _func_enter_;
                }
 
        }
-       else if(check_fwstate(pmlmepriv, WIFI_MP_STATE) == true)
+       else if (check_fwstate(pmlmepriv, WIFI_MP_STATE) == true)
        {
                memcpy(pattrib->dst, GetAddr1Ptr(ptr), ETH_ALEN);
                memcpy(pattrib->src, GetAddr2Ptr(ptr), ETH_ALEN);
@@ -1004,108 +939,104 @@ _func_enter_;
 
 
 
-       if(bmcast)
+       if (bmcast)
                *psta = rtw_get_bcmc_stainfo(adapter);
        else
-               *psta = rtw_get_stainfo(pstapriv, sta_addr); // get ap_info
+               *psta = rtw_get_stainfo(pstapriv, sta_addr); /*  get ap_info */
 
        if (*psta == NULL) {
-               RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("can't get psta under sta2sta_data_frame ; drop pkt\n"));
-               ret= _FAIL;
+               RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("can't get psta under sta2sta_data_frame ; drop pkt\n"));
+               ret = _FAIL;
                goto exit;
        }
 
 exit:
-_func_exit_;
        return ret;
-
 }
 
 sint ap2sta_data_frame(
-       _adapter *adapter,
+       struct adapter *adapter,
        union recv_frame *precv_frame,
-       struct sta_info**psta );
+       struct sta_info**psta);
 sint ap2sta_data_frame(
-       _adapter *adapter,
+       struct adapter *adapter,
        union recv_frame *precv_frame,
-       struct sta_info**psta )
+       struct sta_info**psta)
 {
        u8 *ptr = precv_frame->u.hdr.rx_data;
        struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib;
        sint ret = _SUCCESS;
-       struct  sta_priv                *pstapriv = &adapter->stapriv;
-       struct  mlme_priv       *pmlmepriv = &adapter->mlmepriv;
+       struct  sta_priv        *pstapriv = &adapter->stapriv;
+       struct  mlme_priv *pmlmepriv = &adapter->mlmepriv;
        u8 *mybssid  = get_bssid(pmlmepriv);
        u8 *myhwaddr = myid(&adapter->eeprompriv);
        sint bmcast = IS_MCAST(pattrib->dst);
 
-_func_enter_;
-
        if ((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true)
                && (check_fwstate(pmlmepriv, _FW_LINKED) == true
                        || check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true  )
                )
        {
 
-               // filter packets that SA is myself or multicast or broadcast
-               if (!memcmp(myhwaddr, pattrib->src, ETH_ALEN)){
-                       RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" SA==myself \n"));
+               /*  filter packets that SA is myself or multicast or broadcast */
+               if (!memcmp(myhwaddr, pattrib->src, ETH_ALEN)) {
+                       RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, (" SA ==myself\n"));
                        #ifdef DBG_RX_DROP_FRAME
-                       DBG_871X("DBG_RX_DROP_FRAME %s SA="MAC_FMT", myhwaddr="MAC_FMT"\n",
-                               __FUNCTION__, MAC_ARG(pattrib->src), MAC_ARG(myhwaddr));
+                       DBG_871X("DBG_RX_DROP_FRAME %s SA ="MAC_FMT", myhwaddr ="MAC_FMT"\n",
+                               __func__, MAC_ARG(pattrib->src), MAC_ARG(myhwaddr));
                        #endif
-                       ret= _FAIL;
+                       ret = _FAIL;
                        goto exit;
                }
 
-               // da should be for me
-               if((memcmp(myhwaddr, pattrib->dst, ETH_ALEN))&& (!bmcast))
+               /*  da should be for me */
+               if ((memcmp(myhwaddr, pattrib->dst, ETH_ALEN)) && (!bmcast))
                {
-                       RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,
-                               (" ap2sta_data_frame:  compare DA fail; DA="MAC_FMT"\n", MAC_ARG(pattrib->dst)));
+                       RT_TRACE(_module_rtl871x_recv_c_, _drv_info_,
+                               (" ap2sta_data_frame:  compare DA fail; DA ="MAC_FMT"\n", MAC_ARG(pattrib->dst)));
                        #ifdef DBG_RX_DROP_FRAME
-                       DBG_871X("DBG_RX_DROP_FRAME %s DA="MAC_FMT"\n", __func__, MAC_ARG(pattrib->dst));
+                       DBG_871X("DBG_RX_DROP_FRAME %s DA ="MAC_FMT"\n", __func__, MAC_ARG(pattrib->dst));
                        #endif
-                       ret= _FAIL;
+                       ret = _FAIL;
                        goto exit;
                }
 
 
-               // check BSSID
-               if!memcmp(pattrib->bssid, "\x0\x0\x0\x0\x0\x0", ETH_ALEN) ||
+               /*  check BSSID */
+               if (!memcmp(pattrib->bssid, "\x0\x0\x0\x0\x0\x0", ETH_ALEN) ||
                     !memcmp(mybssid, "\x0\x0\x0\x0\x0\x0", ETH_ALEN) ||
-                    (memcmp(pattrib->bssid, mybssid, ETH_ALEN)) )
+                    (memcmp(pattrib->bssid, mybssid, ETH_ALEN)))
                {
-                       RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,
-                               (" ap2sta_data_frame:  compare BSSID fail ; BSSID="MAC_FMT"\n", MAC_ARG(pattrib->bssid)));
-                       RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("mybssid="MAC_FMT"\n", MAC_ARG(mybssid)));
+                       RT_TRACE(_module_rtl871x_recv_c_, _drv_info_,
+                               (" ap2sta_data_frame:  compare BSSID fail ; BSSID ="MAC_FMT"\n", MAC_ARG(pattrib->bssid)));
+                       RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("mybssid ="MAC_FMT"\n", MAC_ARG(mybssid)));
                        #ifdef DBG_RX_DROP_FRAME
-                       DBG_871X("DBG_RX_DROP_FRAME %s BSSID="MAC_FMT", mybssid="MAC_FMT"\n",
-                               __FUNCTION__, MAC_ARG(pattrib->bssid), MAC_ARG(mybssid));
-                       DBG_871X( "this adapter = %d, buddy adapter = %d\n", adapter->adapter_type, adapter->pbuddy_adapter->adapter_type );
+                       DBG_871X("DBG_RX_DROP_FRAME %s BSSID ="MAC_FMT", mybssid ="MAC_FMT"\n",
+                               __func__, MAC_ARG(pattrib->bssid), MAC_ARG(mybssid));
+                       DBG_871X("this adapter = %d, buddy adapter = %d\n", adapter->adapter_type, adapter->pbuddystruct adapter->adapter_type);
                        #endif
 
-                       if(!bmcast)
+                       if (!bmcast)
                        {
-                               DBG_871X("issue_deauth to the nonassociated ap=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->bssid));
+                               DBG_871X("issue_deauth to the nonassociated ap =" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->bssid));
                                issue_deauth(adapter, pattrib->bssid, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA);
                        }
 
-                       ret= _FAIL;
+                       ret = _FAIL;
                        goto exit;
                }
 
-               if(bmcast)
+               if (bmcast)
                        *psta = rtw_get_bcmc_stainfo(adapter);
                else
-                       *psta = rtw_get_stainfo(pstapriv, pattrib->bssid); // get ap_info
+                       *psta = rtw_get_stainfo(pstapriv, pattrib->bssid); /*  get ap_info */
 
                if (*psta == NULL) {
-                       RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("ap2sta: can't get psta under STATION_MODE ; drop pkt\n"));
+                       RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("ap2sta: can't get psta under STATION_MODE ; drop pkt\n"));
                        #ifdef DBG_RX_DROP_FRAME
-                       DBG_871X("DBG_RX_DROP_FRAME %s can't get psta under STATION_MODE ; drop pkt\n", __FUNCTION__);
+                       DBG_871X("DBG_RX_DROP_FRAME %s can't get psta under STATION_MODE ; drop pkt\n", __func__);
                        #endif
-                       ret= _FAIL;
+                       ret = _FAIL;
                        goto exit;
                }
 
@@ -1121,7 +1052,7 @@ _func_enter_;
 
        }
        else if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == true) &&
-                    (check_fwstate(pmlmepriv, _FW_LINKED) == true) )
+                    (check_fwstate(pmlmepriv, _FW_LINKED) == true))
        {
                memcpy(pattrib->dst, GetAddr1Ptr(ptr), ETH_ALEN);
                memcpy(pattrib->src, GetAddr2Ptr(ptr), ETH_ALEN);
@@ -1129,17 +1060,17 @@ _func_enter_;
                memcpy(pattrib->ra, pattrib->dst, ETH_ALEN);
                memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
 
-               //
+               /*  */
                memcpy(pattrib->bssid,  mybssid, ETH_ALEN);
 
 
-               *psta = rtw_get_stainfo(pstapriv, pattrib->bssid); // get sta_info
+               *psta = rtw_get_stainfo(pstapriv, pattrib->bssid); /*  get sta_info */
                if (*psta == NULL) {
-                       RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("can't get psta under MP_MODE ; drop pkt\n"));
+                       RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("can't get psta under MP_MODE ; drop pkt\n"));
                        #ifdef DBG_RX_DROP_FRAME
-                       DBG_871X("DBG_RX_DROP_FRAME %s can't get psta under WIFI_MP_STATE ; drop pkt\n", __FUNCTION__);
+                       DBG_871X("DBG_RX_DROP_FRAME %s can't get psta under WIFI_MP_STATE ; drop pkt\n", __func__);
                        #endif
-                       ret= _FAIL;
+                       ret = _FAIL;
                        goto exit;
                }
 
@@ -1153,22 +1084,22 @@ _func_enter_;
        }
        else
        {
-               if(!memcmp(myhwaddr, pattrib->dst, ETH_ALEN)&& (!bmcast))
+               if (!memcmp(myhwaddr, pattrib->dst, ETH_ALEN) && (!bmcast))
                {
-                       *psta = rtw_get_stainfo(pstapriv, pattrib->bssid); // get sta_info
+                       *psta = rtw_get_stainfo(pstapriv, pattrib->bssid); /*  get sta_info */
                        if (*psta == NULL)
                        {
 
-                               //for AP multicast issue , modify by yiwei
-                               static unsigned long send_issue_deauth_time=0;
+                               /* for AP multicast issue , modify by yiwei */
+                               static unsigned long send_issue_deauth_time = 0;
 
-                               //DBG_871X("After send deauth , %u ms has elapsed.\n", jiffies_to_msecs(jiffies - send_issue_deauth_time));
+                               /* DBG_871X("After send deauth , %u ms has elapsed.\n", jiffies_to_msecs(jiffies - send_issue_deauth_time)); */
 
-                               if(jiffies_to_msecs(jiffies - send_issue_deauth_time) > 10000 || send_issue_deauth_time == 0 )
+                               if (jiffies_to_msecs(jiffies - send_issue_deauth_time) > 10000 || send_issue_deauth_time == 0)
                                {
                                        send_issue_deauth_time = jiffies;
 
-                                       DBG_871X("issue_deauth to the ap=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->bssid));
+                                       DBG_871X("issue_deauth to the ap =" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->bssid));
 
                                        issue_deauth(adapter, pattrib->bssid, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA);
                                }
@@ -1177,50 +1108,44 @@ _func_enter_;
 
                ret = _FAIL;
                #ifdef DBG_RX_DROP_FRAME
-               DBG_871X("DBG_RX_DROP_FRAME %s fw_state:0x%x\n", __FUNCTION__, get_fwstate(pmlmepriv));
+               DBG_871X("DBG_RX_DROP_FRAME %s fw_state:0x%x\n", __func__, get_fwstate(pmlmepriv));
                #endif
        }
 
 exit:
-
-_func_exit_;
-
        return ret;
-
 }
 
 sint sta2ap_data_frame(
-       _adapter *adapter,
+       struct adapter *adapter,
        union recv_frame *precv_frame,
-       struct sta_info**psta );
+       struct sta_info**psta);
 sint sta2ap_data_frame(
-       _adapter *adapter,
+       struct adapter *adapter,
        union recv_frame *precv_frame,
-       struct sta_info**psta )
+       struct sta_info**psta)
 {
        u8 *ptr = precv_frame->u.hdr.rx_data;
        struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib;
-       struct  sta_priv                *pstapriv = &adapter->stapriv;
-       struct  mlme_priv       *pmlmepriv = &adapter->mlmepriv;
+       struct  sta_priv        *pstapriv = &adapter->stapriv;
+       struct  mlme_priv *pmlmepriv = &adapter->mlmepriv;
        unsigned char *mybssid  = get_bssid(pmlmepriv);
-       sint ret=_SUCCESS;
-
-_func_enter_;
+       sint ret = _SUCCESS;
 
        if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
        {
-               //For AP mode, RA=BSSID, TX=STA(SRC_ADDR), A3=DST_ADDR
-               if(memcmp(pattrib->bssid, mybssid, ETH_ALEN))
+               /* For AP mode, RA =BSSID, TX =STA(SRC_ADDR), A3 =DST_ADDR */
+               if (memcmp(pattrib->bssid, mybssid, ETH_ALEN))
                {
-                       ret= _FAIL;
+                       ret = _FAIL;
                        goto exit;
                }
 
                *psta = rtw_get_stainfo(pstapriv, pattrib->src);
                if (*psta == NULL)
                {
-                       RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("can't get psta under AP_MODE; drop pkt\n"));
-                       DBG_871X("issue_deauth to sta=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->src));
+                       RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("can't get psta under AP_MODE; drop pkt\n"));
+                       DBG_871X("issue_deauth to sta =" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->src));
 
                        issue_deauth(adapter, pattrib->src, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA);
 
@@ -1247,64 +1172,60 @@ _func_enter_;
                        ret = RTW_RX_HANDLED;
                        goto exit;
                }
-               DBG_871X("issue_deauth to sta=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->src));
+               DBG_871X("issue_deauth to sta =" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->src));
                issue_deauth(adapter, pattrib->src, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA);
                ret = RTW_RX_HANDLED;
                goto exit;
        }
 
 exit:
-
-_func_exit_;
-
        return ret;
-
 }
 
-sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame);
-sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame)
+sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_frame);
+sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_frame)
 {
        struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
        struct sta_priv *pstapriv = &padapter->stapriv;
        u8 *pframe = precv_frame->u.hdr.rx_data;
-       struct sta_info *psta=NULL;
-       //uint len = precv_frame->u.hdr.len;
+       struct sta_info *psta = NULL;
+       /* uint len = precv_frame->u.hdr.len; */
 
-       //DBG_871X("+validate_recv_ctrl_frame\n");
+       /* DBG_871X("+validate_recv_ctrl_frame\n"); */
 
        if (GetFrameType(pframe) != WIFI_CTRL_TYPE)
        {
                return _FAIL;
        }
 
-       //receive the frames that ra(a1) is my address
+       /* receive the frames that ra(a1) is my address */
        if (memcmp(GetAddr1Ptr(pframe), myid(&padapter->eeprompriv), ETH_ALEN))
        {
                return _FAIL;
        }
 
        psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe));
-       if (psta==NULL)
+       if (psta == NULL)
        {
                return _FAIL;
        }
 
-       //for rx pkt statistics
+       /* for rx pkt statistics */
        psta->sta_stats.rx_ctrl_pkts++;
 
-       //only handle ps-poll
-       if(GetFrameSubType(pframe) == WIFI_PSPOLL)
+       /* only handle ps-poll */
+       if (GetFrameSubType(pframe) == WIFI_PSPOLL)
        {
                u16 aid;
-               u8 wmmps_ac=0;
+               u8 wmmps_ac = 0;
 
                aid = GetAid(pframe);
-               if(psta->aid!=aid)
+               if (psta->aid!=aid)
                {
                        return _FAIL;
                }
 
-               switch(pattrib->priority)
+               switch (pattrib->priority)
                {
                        case 1:
                        case 2:
@@ -1325,24 +1246,23 @@ sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame)
                                break;
                }
 
-               if(wmmps_ac)
+               if (wmmps_ac)
                        return _FAIL;
 
-               if(psta->state & WIFI_STA_ALIVE_CHK_STATE)
+               if (psta->state & WIFI_STA_ALIVE_CHK_STATE)
                {
                        DBG_871X("%s alive check-rx ps-poll\n", __func__);
                        psta->expire_to = pstapriv->expire_to;
                        psta->state ^= WIFI_STA_ALIVE_CHK_STATE;
                }
 
-               if((psta->state&WIFI_SLEEP_STATE) && (pstapriv->sta_dz_bitmap&BIT(psta->aid)))
+               if ((psta->state&WIFI_SLEEP_STATE) && (pstapriv->sta_dz_bitmap&BIT(psta->aid)))
                {
-                       _irqL irqL;
-                       _list   *xmitframe_plist, *xmitframe_phead;
-                       struct xmit_frame *pxmitframe=NULL;
+                       struct list_head        *xmitframe_plist, *xmitframe_phead;
+                       struct xmit_frame *pxmitframe = NULL;
                        struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
 
-                       //spin_lock_bh(&psta->sleep_q.lock);
+                       /* spin_lock_bh(&psta->sleep_q.lock); */
                        spin_lock_bh(&pxmitpriv->lock);
 
                        xmitframe_phead = get_list_head(&psta->sleep_q);
@@ -1358,57 +1278,57 @@ sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame)
 
                                psta->sleepq_len--;
 
-                               if(psta->sleepq_len>0)
+                               if (psta->sleepq_len>0)
                                        pxmitframe->attrib.mdata = 1;
                                else
                                        pxmitframe->attrib.mdata = 0;
 
                                pxmitframe->attrib.triggered = 1;
 
-                               //DBG_871X("handling ps-poll, q_len=%d, tim=%x\n", psta->sleepq_len, pstapriv->tim_bitmap);
+                               /* DBG_871X("handling ps-poll, q_len =%d, tim =%x\n", psta->sleepq_len, pstapriv->tim_bitmap); */
 
                                rtw_hal_xmitframe_enqueue(padapter, pxmitframe);
 
-                               if(psta->sleepq_len==0)
+                               if (psta->sleepq_len == 0)
                                {
                                        pstapriv->tim_bitmap &= ~BIT(psta->aid);
 
-                                       //DBG_871X("after handling ps-poll, tim=%x\n", pstapriv->tim_bitmap);
+                                       /* DBG_871X("after handling ps-poll, tim =%x\n", pstapriv->tim_bitmap); */
 
-                                       //upate BCN for TIM IE
-                                       //update_BCNTIM(padapter);
+                                       /* upate BCN for TIM IE */
+                                       /* update_BCNTIM(padapter); */
                                        update_beacon(padapter, _TIM_IE_, NULL, true);
                                }
 
-                               //spin_unlock_bh(&psta->sleep_q.lock);
+                               /* spin_unlock_bh(&psta->sleep_q.lock); */
                                spin_unlock_bh(&pxmitpriv->lock);
 
                        }
                        else
                        {
-                               //spin_unlock_bh(&psta->sleep_q.lock);
+                               /* spin_unlock_bh(&psta->sleep_q.lock); */
                                spin_unlock_bh(&pxmitpriv->lock);
 
-                               //DBG_871X("no buffered packets to xmit\n");
-                               if(pstapriv->tim_bitmap&BIT(psta->aid))
+                               /* DBG_871X("no buffered packets to xmit\n"); */
+                               if (pstapriv->tim_bitmap&BIT(psta->aid))
                                {
-                                       if(psta->sleepq_len==0)
+                                       if (psta->sleepq_len == 0)
                                        {
                                                DBG_871X("no buffered packets to xmit\n");
 
-                                               //issue nulldata with More data bit = 0 to indicate we have no buffered packets
+                                               /* issue nulldata with More data bit = 0 to indicate we have no buffered packets */
                                                issue_nulldata_in_interrupt(padapter, psta->hwaddr);
                                        }
                                        else
                                        {
-                                               DBG_871X("error!psta->sleepq_len=%d\n", psta->sleepq_len);
-                                               psta->sleepq_len=0;
+                                               DBG_871X("error!psta->sleepq_len =%d\n", psta->sleepq_len);
+                                               psta->sleepq_len = 0;
                                        }
 
                                        pstapriv->tim_bitmap &= ~BIT(psta->aid);
 
-                                       //upate BCN for TIM IE
-                                       //update_BCNTIM(padapter);
+                                       /* upate BCN for TIM IE */
+                                       /* update_BCNTIM(padapter); */
                                        update_beacon(padapter, _TIM_IE_, NULL, true);
                                }
                        }
@@ -1419,22 +1339,22 @@ sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame)
 
 }
 
-union recv_frame* recvframe_chk_defrag(PADAPTER padapter, union recv_frame *precv_frame);
-sint validate_recv_mgnt_frame(PADAPTER padapter, union recv_frame *precv_frame);
-sint validate_recv_mgnt_frame(PADAPTER padapter, union recv_frame *precv_frame)
+union recv_frame* recvframe_chk_defrag(struct adapter *padapter, union recv_frame *precv_frame);
+sint validate_recv_mgnt_frame(struct adapter *padapter, union recv_frame *precv_frame);
+sint validate_recv_mgnt_frame(struct adapter *padapter, union recv_frame *precv_frame)
 {
-       //struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
+       /* struct mlme_priv *pmlmepriv = &adapter->mlmepriv; */
 
        RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("+validate_recv_mgnt_frame\n"));
 
        precv_frame = recvframe_chk_defrag(padapter, precv_frame);
        if (precv_frame == NULL) {
-               RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_,("%s: fragment packet\n",__FUNCTION__));
+               RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("%s: fragment packet\n", __func__));
                return _SUCCESS;
        }
 
        {
-               //for rx pkt statistics
+               /* for rx pkt statistics */
                struct sta_info *psta = rtw_get_stainfo(&padapter->stapriv, GetAddr2Ptr(precv_frame->u.hdr.rx_data));
                if (psta) {
                        psta->sta_stats.rx_mgnt_pkts++;
@@ -1460,30 +1380,27 @@ sint validate_recv_mgnt_frame(PADAPTER padapter, union recv_frame *precv_frame)
 
 }
 
-sint validate_recv_data_frame(_adapter *adapter, union recv_frame *precv_frame);
-sint validate_recv_data_frame(_adapter *adapter, union recv_frame *precv_frame)
+sint validate_recv_data_frame(struct adapter *adapter, union recv_frame *precv_frame);
+sint validate_recv_data_frame(struct adapter *adapter, union recv_frame *precv_frame)
 {
        u8 bretry;
        u8 *psa, *pda, *pbssid;
        struct sta_info *psta = NULL;
        u8 *ptr = precv_frame->u.hdr.rx_data;
        struct rx_pkt_attrib    *pattrib = & precv_frame->u.hdr.attrib;
-       struct sta_priv         *pstapriv = &adapter->stapriv;
-       struct security_priv    *psecuritypriv = &adapter->securitypriv;
+       struct security_priv *psecuritypriv = &adapter->securitypriv;
        sint ret = _SUCCESS;
 
-_func_enter_;
-
        bretry = GetRetry(ptr);
        pda = get_da(ptr);
        psa = get_sa(ptr);
        pbssid = get_hdr_bssid(ptr);
 
-       if(pbssid == NULL){
+       if (pbssid == NULL) {
                #ifdef DBG_RX_DROP_FRAME
                DBG_871X("DBG_RX_DROP_FRAME %s pbssid == NULL\n", __func__);
                #endif
-               ret= _FAIL;
+               ret = _FAIL;
                goto exit;
        }
 
@@ -1492,7 +1409,7 @@ _func_enter_;
 
        memcpy(pattrib->bssid, pbssid, ETH_ALEN);
 
-       switch(pattrib->to_fr_ds)
+       switch (pattrib->to_fr_ds)
        {
                case 0:
                        memcpy(pattrib->ra, pda, ETH_ALEN);
@@ -1515,19 +1432,19 @@ _func_enter_;
                case 3:
                        memcpy(pattrib->ra, GetAddr1Ptr(ptr), ETH_ALEN);
                        memcpy(pattrib->ta, GetAddr2Ptr(ptr), ETH_ALEN);
-                       ret =_FAIL;
-                       RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" case 3\n"));
+                       ret = _FAIL;
+                       RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, (" case 3\n"));
                        break;
 
                default:
-                       ret =_FAIL;
+                       ret = _FAIL;
                        break;
 
        }
 
-       if(ret ==_FAIL){
+       if (ret == _FAIL) {
                #ifdef DBG_RX_DROP_FRAME
-               DBG_871X("DBG_RX_DROP_FRAME %s case:%d, res:%d\n", __FUNCTION__, pattrib->to_fr_ds, ret);
+               DBG_871X("DBG_RX_DROP_FRAME %s case:%d, res:%d\n", __func__, pattrib->to_fr_ds, ret);
                #endif
                goto exit;
        } else if (ret == RTW_RX_HANDLED) {
@@ -1535,68 +1452,68 @@ _func_enter_;
        }
 
 
-       if(psta==NULL){
-               RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" after to_fr_ds_chk; psta==NULL \n"));
+       if (psta == NULL) {
+               RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, (" after to_fr_ds_chk; psta == NULL\n"));
                #ifdef DBG_RX_DROP_FRAME
                DBG_871X("DBG_RX_DROP_FRAME %s psta == NULL\n", __func__);
                #endif
-               ret= _FAIL;
+               ret = _FAIL;
                goto exit;
        }
 
-       //psta->rssi = prxcmd->rssi;
-       //psta->signal_quality= prxcmd->sq;
+       /* psta->rssi = prxcmd->rssi; */
+       /* psta->signal_quality = prxcmd->sq; */
        precv_frame->u.hdr.psta = psta;
 
 
-       pattrib->amsdu=0;
+       pattrib->amsdu = 0;
        pattrib->ack_policy = 0;
-       //parsing QC field
-       if(pattrib->qos == 1)
+       /* parsing QC field */
+       if (pattrib->qos == 1)
        {
                pattrib->priority = GetPriority((ptr + 24));
                pattrib->ack_policy = GetAckpolicy((ptr + 24));
                pattrib->amsdu = GetAMsdu((ptr + 24));
-               pattrib->hdrlen = pattrib->to_fr_ds==3 ? 32 : 26;
+               pattrib->hdrlen = pattrib->to_fr_ds ==3 ? 32 : 26;
 
-               if(pattrib->priority!=0 && pattrib->priority!=3)
+               if (pattrib->priority!= 0 && pattrib->priority!=3)
                {
                        adapter->recvpriv.bIsAnyNonBEPkts = true;
                }
        }
        else
        {
-               pattrib->priority=0;
-               pattrib->hdrlen = pattrib->to_fr_ds==3 ? 30 : 24;
+               pattrib->priority = 0;
+               pattrib->hdrlen = pattrib->to_fr_ds ==3 ? 30 : 24;
        }
 
 
-       if(pattrib->order)//HT-CTRL 11n
+       if (pattrib->order)/* HT-CTRL 11n */
        {
                pattrib->hdrlen += 4;
        }
 
        precv_frame->u.hdr.preorder_ctrl = &psta->recvreorder_ctrl[pattrib->priority];
 
-       // decache, drop duplicate recv packets
-       if(recv_decache(precv_frame, bretry, &psta->sta_recvpriv.rxcache) == _FAIL)
+       /*  decache, drop duplicate recv packets */
+       if (recv_decache(precv_frame, bretry, &psta->sta_recvpriv.rxcache) == _FAIL)
        {
-               RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("decache : drop pkt\n"));
+               RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("decache : drop pkt\n"));
                #ifdef DBG_RX_DROP_FRAME
                DBG_871X("DBG_RX_DROP_FRAME %s recv_decache return _FAIL\n", __func__);
                #endif
-               ret= _FAIL;
+               ret = _FAIL;
                goto exit;
        }
 
-       if(pattrib->privacy){
+       if (pattrib->privacy) {
 
-               RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("validate_recv_data_frame:pattrib->privacy=%x\n", pattrib->privacy));
-               RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("\n ^^^^^^^^^^^IS_MCAST(pattrib->ra(0x%02x))=%d^^^^^^^^^^^^^^^6\n", pattrib->ra[0],IS_MCAST(pattrib->ra)));
+               RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("validate_recv_data_frame:pattrib->privacy =%x\n", pattrib->privacy));
+               RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("\n ^^^^^^^^^^^IS_MCAST(pattrib->ra(0x%02x)) =%d^^^^^^^^^^^^^^^6\n", pattrib->ra[0], IS_MCAST(pattrib->ra)));
 
                GET_ENCRY_ALGO(psecuritypriv, psta, pattrib->encrypt, IS_MCAST(pattrib->ra));
 
-               RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("\n pattrib->encrypt=%d\n",pattrib->encrypt));
+               RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("\n pattrib->encrypt =%d\n", pattrib->encrypt));
 
                SET_ICE_IV_LEN(pattrib->iv_len, pattrib->icv_len, pattrib->encrypt);
        }
@@ -1607,13 +1524,10 @@ _func_enter_;
        }
 
 exit:
-
-_func_exit_;
-
        return ret;
 }
 
-static sint validate_80211w_mgmt(_adapter *adapter, union recv_frame *precv_frame)
+static sint validate_80211w_mgmt(struct adapter *adapter, union recv_frame *precv_frame)
 {
        struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
        struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib;
@@ -1622,104 +1536,87 @@ static sint validate_80211w_mgmt(_adapter *adapter, union recv_frame *precv_fram
        u8 subtype;
 
        type =  GetFrameType(ptr);
-       subtype = GetFrameSubType(ptr); //bit(7)~bit(2)
+       subtype = GetFrameSubType(ptr); /* bit(7)~bit(2) */
 
-       //only support station mode
-       if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED)
+       /* only support station mode */
+       if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED)
                && adapter->securitypriv.binstallBIPkey == true)
        {
-               //unicast management frame decrypt
-               if(pattrib->privacy && !(IS_MCAST(GetAddr1Ptr(ptr))) &&
+               /* unicast management frame decrypt */
+               if (pattrib->privacy && !(IS_MCAST(GetAddr1Ptr(ptr))) &&
                        (subtype == WIFI_DEAUTH || subtype == WIFI_DISASSOC || subtype == WIFI_ACTION))
                {
                        u8 *ppp, *mgmt_DATA;
-                       u32 data_len=0;
+                       u32 data_len = 0;
                        ppp = GetAddr2Ptr(ptr);
 
                        pattrib->bdecrypted = 0;
                        pattrib->encrypt = _AES_;
-                       pattrib->hdrlen = sizeof(struct rtw_ieee80211_hdr_3addr);
-                       //set iv and icv length
+                       pattrib->hdrlen = sizeof(struct ieee80211_hdr_3addr);
+                       /* set iv and icv length */
                        SET_ICE_IV_LEN(pattrib->iv_len, pattrib->icv_len, pattrib->encrypt);
                        memcpy(pattrib->ra, GetAddr1Ptr(ptr), ETH_ALEN);
                        memcpy(pattrib->ta, GetAddr2Ptr(ptr), ETH_ALEN);
-                       //actual management data frame body
+                       /* actual management data frame body */
                        data_len = pattrib->pkt_len - pattrib->hdrlen - pattrib->iv_len - pattrib->icv_len;
                        mgmt_DATA = rtw_zmalloc(data_len);
-                       if(mgmt_DATA == NULL)
+                       if (mgmt_DATA == NULL)
                        {
-                               DBG_871X("%s mgmt allocate fail  !!!!!!!!!\n", __FUNCTION__);
+                               DBG_871X("%s mgmt allocate fail  !!!!!!!!!\n", __func__);
                                goto validate_80211w_fail;
                        }
-                       /*//dump the packet content before decrypt
-                       {
-                               int pp;
-                               printk("pattrib->pktlen = %d =>", pattrib->pkt_len);
-                               for(pp=0;pp< pattrib->pkt_len; pp++)
-                                       printk(" %02x ", ptr[pp]);
-                               printk("\n");
-                       }*/
-
                        precv_frame = decryptor(adapter, precv_frame);
-                       //save actual management data frame body
+                       /* save actual management data frame body */
                        memcpy(mgmt_DATA, ptr+pattrib->hdrlen+pattrib->iv_len, data_len);
-                       //overwrite the iv field
+                       /* overwrite the iv field */
                        memcpy(ptr+pattrib->hdrlen, mgmt_DATA, data_len);
-                       //remove the iv and icv length
+                       /* remove the iv and icv length */
                        pattrib->pkt_len = pattrib->pkt_len - pattrib->iv_len - pattrib->icv_len;
                        kfree(mgmt_DATA);
-                       /*//print packet content after decryption
-                       {
-                               int pp;
-                               printk("after decryption pattrib->pktlen = %d @@=>", pattrib->pkt_len);
-                               for(pp=0;pp< pattrib->pkt_len; pp++)
-                                       printk(" %02x ", ptr[pp]);
-                               printk("\n");
-                       }*/
-                       if(!precv_frame)
+                       if (!precv_frame)
                        {
-                               DBG_871X("%s mgmt descrypt fail  !!!!!!!!!\n", __FUNCTION__);
+                               DBG_871X("%s mgmt descrypt fail  !!!!!!!!!\n", __func__);
                                goto validate_80211w_fail;
                        }
                }
-               else if(IS_MCAST(GetAddr1Ptr(ptr)) &&
+               else if (IS_MCAST(GetAddr1Ptr(ptr)) &&
                        (subtype == WIFI_DEAUTH || subtype == WIFI_DISASSOC))
                {
                        sint BIP_ret = _SUCCESS;
-                       //verify BIP MME IE of broadcast/multicast de-auth/disassoc packet
-                       BIP_ret = rtw_BIP_verify(adapter, (u8 * )precv_frame);
-                       if(BIP_ret == _FAIL)
+                       /* verify BIP MME IE of broadcast/multicast de-auth/disassoc packet */
+                       BIP_ret = rtw_BIP_verify(adapter, (u8 *)precv_frame);
+                       if (BIP_ret == _FAIL)
                        {
-                               //DBG_871X("802.11w BIP verify fail\n");
+                               /* DBG_871X("802.11w BIP verify fail\n"); */
                                goto validate_80211w_fail;
                        }
-                       else if(BIP_ret == RTW_RX_HANDLED)
+                       else if (BIP_ret == RTW_RX_HANDLED)
                        {
-                               //DBG_871X("802.11w recv none protected packet\n");
-                               //issue sa query request
+                               /* DBG_871X("802.11w recv none protected packet\n"); */
+                               /* issue sa query request */
                                issue_action_SA_Query(adapter, NULL, 0, 0);
                                goto validate_80211w_fail;
                        }
-               }//802.11w protect
+               }/* 802.11w protect */
                else
                {
-                       if(subtype == WIFI_ACTION)
+                       if (subtype == WIFI_ACTION)
                        {
-                               //according 802.11-2012 standard, these five types are not robust types
-                               ifptr[WLAN_HDR_A3_LEN] != RTW_WLAN_CATEGORY_PUBLIC          &&
+                               /* according 802.11-2012 standard, these five types are not robust types */
+                               if (ptr[WLAN_HDR_A3_LEN] != RTW_WLAN_CATEGORY_PUBLIC          &&
                                        ptr[WLAN_HDR_A3_LEN] != RTW_WLAN_CATEGORY_HT              &&
                                        ptr[WLAN_HDR_A3_LEN] != RTW_WLAN_CATEGORY_UNPROTECTED_WNM &&
                                        ptr[WLAN_HDR_A3_LEN] != RTW_WLAN_CATEGORY_SELF_PROTECTED  &&
                                        ptr[WLAN_HDR_A3_LEN] != RTW_WLAN_CATEGORY_P2P)
                                {
-                                       DBG_871X("action frame category=%d should robust\n", ptr[WLAN_HDR_A3_LEN]);
+                                       DBG_871X("action frame category =%d should robust\n", ptr[WLAN_HDR_A3_LEN]);
                                        goto validate_80211w_fail;
                                }
                        }
-                       else if(subtype == WIFI_DEAUTH || subtype == WIFI_DISASSOC)
+                       else if (subtype == WIFI_DEAUTH || subtype == WIFI_DISASSOC)
                        {
                                DBG_871X("802.11w recv none protected packet\n");
-                               //issue sa query request
+                               /* issue sa query request */
                                issue_action_SA_Query(adapter, NULL, 0, 0);
                                goto validate_80211w_fail;
                        }
@@ -1736,19 +1633,19 @@ static inline void dump_rx_packet(u8 *ptr)
 {
        int i;
 
-       DBG_871X("############################# \n");
-       for(i=0; i<64;i=i+8)
+       DBG_871X("#############################\n");
+       for (i = 0; i<64;i =i+8)
                DBG_871X("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:\n", *(ptr+i),
                *(ptr+i+1), *(ptr+i+2) ,*(ptr+i+3) ,*(ptr+i+4),*(ptr+i+5), *(ptr+i+6), *(ptr+i+7));
-       DBG_871X("############################# \n");
+       DBG_871X("#############################\n");
 }
 
-sint validate_recv_frame(_adapter *adapter, union recv_frame *precv_frame);
-sint validate_recv_frame(_adapter *adapter, union recv_frame *precv_frame)
+sint validate_recv_frame(struct adapter *adapter, union recv_frame *precv_frame);
+sint validate_recv_frame(struct adapter *adapter, union recv_frame *precv_frame)
 {
-       //shall check frame subtype, to / from ds, da, bssid
+       /* shall check frame subtype, to / from ds, da, bssid */
 
-       //then call check if rx seq/frag. duplicated.
+       /* then call check if rx seq/frag. duplicated. */
 
        u8 type;
        u8 subtype;
@@ -1759,18 +1656,16 @@ sint validate_recv_frame(_adapter *adapter, union recv_frame *precv_frame)
        u8 *ptr = precv_frame->u.hdr.rx_data;
        u8  ver =(unsigned char) (*ptr)&0x3 ;
 
-_func_enter_;
-
-       //add version chk
-       if(ver!=0){
-               RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("validate_recv_data_frame fail! (ver!=0)\n"));
-               retval= _FAIL;
+       /* add version chk */
+       if (ver!= 0) {
+               RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("validate_recv_data_frame fail! (ver!= 0)\n"));
+               retval = _FAIL;
                DBG_COUNTER(adapter->rx_logs.core_rx_pre_ver_err);
                goto exit;
        }
 
        type =  GetFrameType(ptr);
-       subtype = GetFrameSubType(ptr); //bit(7)~bit(2)
+       subtype = GetFrameSubType(ptr); /* bit(7)~bit(2) */
 
        pattrib->to_fr_ds = get_tofr_ds(ptr);
 
@@ -1785,7 +1680,7 @@ _func_enter_;
 {
        u8 bDumpRxPkt;
        rtw_hal_get_def_var(adapter, HAL_DEF_DBG_DUMP_RXPKT, &(bDumpRxPkt));
-       if (bDumpRxPkt == 1) //dump all rx packets
+       if (bDumpRxPkt == 1) /* dump all rx packets */
                dump_rx_packet(ptr);
        else if ((bDumpRxPkt == 2) && (type == WIFI_MGT_TYPE))
                dump_rx_packet(ptr);
@@ -1795,9 +1690,9 @@ _func_enter_;
 
        switch (type)
        {
-               case WIFI_MGT_TYPE: //mgnt
+               case WIFI_MGT_TYPE: /* mgnt */
                        DBG_COUNTER(adapter->rx_logs.core_rx_pre_mgmt);
-                       if(validate_80211w_mgmt(adapter, precv_frame) == _FAIL)
+                       if (validate_80211w_mgmt(adapter, precv_frame) == _FAIL)
                        {
                                retval = _FAIL;
                                DBG_COUNTER(padapter->rx_logs.core_rx_pre_mgmt_err_80211w);
@@ -1807,22 +1702,22 @@ _func_enter_;
                        retval = validate_recv_mgnt_frame(adapter, precv_frame);
                        if (retval == _FAIL)
                        {
-                               RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("validate_recv_mgnt_frame fail\n"));
+                               RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("validate_recv_mgnt_frame fail\n"));
                                DBG_COUNTER(adapter->rx_logs.core_rx_pre_mgmt_err);
                        }
-                       retval = _FAIL; // only data frame return _SUCCESS
+                       retval = _FAIL; /*  only data frame return _SUCCESS */
                        break;
-               case WIFI_CTRL_TYPE: //ctrl
+               case WIFI_CTRL_TYPE: /* ctrl */
                        DBG_COUNTER(adapter->rx_logs.core_rx_pre_ctrl);
                        retval = validate_recv_ctrl_frame(adapter, precv_frame);
                        if (retval == _FAIL)
                        {
-                               RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("validate_recv_ctrl_frame fail\n"));
+                               RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("validate_recv_ctrl_frame fail\n"));
                                DBG_COUNTER(adapter->rx_logs.core_rx_pre_ctrl_err);
                        }
-                       retval = _FAIL; // only data frame return _SUCCESS
+                       retval = _FAIL; /*  only data frame return _SUCCESS */
                        break;
-               case WIFI_DATA_TYPE: //data
+               case WIFI_DATA_TYPE: /* data */
                        DBG_COUNTER(adapter->rx_logs.core_rx_pre_data);
 
                        pattrib->qos = (subtype & BIT(7))? 1:0;
@@ -1830,7 +1725,7 @@ _func_enter_;
                        if (retval == _FAIL)
                        {
                                struct recv_priv *precvpriv = &adapter->recvpriv;
-                               //RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("validate_recv_data_frame fail\n"));
+                               /* RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("validate_recv_data_frame fail\n")); */
                                precvpriv->rx_drop++;
                                DBG_COUNTER(adapter->rx_logs.core_rx_pre_data_err);
                        }
@@ -1840,9 +1735,9 @@ _func_enter_;
                                u8 bDumpRxPkt;
                                u16 eth_type;
 
-                               // dump eapol
+                               /*  dump eapol */
                                rtw_hal_get_def_var(adapter, HAL_DEF_DBG_DUMP_RXPKT, &(bDumpRxPkt));
-                               // get ether_type
+                               /*  get ether_type */
                                memcpy(&eth_type, ptr + pattrib->hdrlen + pattrib->iv_len + LLC_HEADER_SIZE, 2);
                                eth_type = ntohs((unsigned short) eth_type);
                                if ((bDumpRxPkt == 4) && (eth_type == 0x888e))
@@ -1856,54 +1751,48 @@ _func_enter_;
                        break;
                default:
                        DBG_COUNTER(adapter->rx_logs.core_rx_pre_unknown);
-                       RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("validate_recv_data_frame fail! type=0x%x\n", type));
+                       RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("validate_recv_data_frame fail! type = 0x%x\n", type));
                        #ifdef DBG_RX_DROP_FRAME
-                       DBG_871X("DBG_RX_DROP_FRAME validate_recv_data_frame fail! type=0x%x\n", type);
+                       DBG_871X("DBG_RX_DROP_FRAME validate_recv_data_frame fail! type = 0x%x\n", type);
                        #endif
                        retval = _FAIL;
                        break;
        }
 
 exit:
-
-_func_exit_;
-
        return retval;
 }
 
 
-//remove the wlanhdr and add the eth_hdr
-sint wlanhdr_to_ethhdr ( union recv_frame *precvframe);
-sint wlanhdr_to_ethhdr ( union recv_frame *precvframe)
+/* remove the wlanhdr and add the eth_hdr */
+sint wlanhdr_to_ethhdr (union recv_frame *precvframe);
+sint wlanhdr_to_ethhdr (union recv_frame *precvframe)
 {
        sint    rmv_len;
-       u16     eth_type, len;
-       u8      bsnaphdr;
-       u8      *psnap_type;
+       u16 eth_type, len;
+       u8 bsnaphdr;
+       u8 *psnap_type;
        struct ieee80211_snap_hdr       *psnap;
-
-       sint ret=_SUCCESS;
-       _adapter                        *adapter =precvframe->u.hdr.adapter;
-       struct mlme_priv        *pmlmepriv = &adapter->mlmepriv;
-
-       u8      *ptr = get_recvframe_data(precvframe) ; // point to frame_ctrl field
+       __be16 be_tmp;
+       sint ret = _SUCCESS;
+       struct adapter                  *adapter =precvframe->u.hdr.adapter;
+       struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
+       u8 *ptr = get_recvframe_data(precvframe) ; /*  point to frame_ctrl field */
        struct rx_pkt_attrib *pattrib = & precvframe->u.hdr.attrib;
 
-_func_enter_;
-
-       if(pattrib->encrypt){
+       if (pattrib->encrypt) {
                recvframe_pull_tail(precvframe, pattrib->icv_len);
        }
 
-       psnap=(struct ieee80211_snap_hdr        *)(ptr+pattrib->hdrlen + pattrib->iv_len);
-       psnap_type=ptr+pattrib->hdrlen + pattrib->iv_len+SNAP_SIZE;
+       psnap =(struct ieee80211_snap_hdr       *)(ptr+pattrib->hdrlen + pattrib->iv_len);
+       psnap_type =ptr+pattrib->hdrlen + pattrib->iv_len+SNAP_SIZE;
        /* convert hdr + possible LLC headers into Ethernet header */
-       //eth_type = (psnap_type[0] << 8) | psnap_type[1];
-       if((!memcmp(psnap, rtw_rfc1042_header, SNAP_SIZE) &&
+       /* eth_type = (psnap_type[0] << 8) | psnap_type[1]; */
+       if ((!memcmp(psnap, rtw_rfc1042_header, SNAP_SIZE) &&
                (memcmp(psnap_type, SNAP_ETH_TYPE_IPX, 2)) &&
-               (memcmp(psnap_type, SNAP_ETH_TYPE_APPLETALK_AARP, 2)) )||
-               //eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) ||
-                !memcmp(psnap, rtw_bridge_tunnel_header, SNAP_SIZE)){
+               (memcmp(psnap_type, SNAP_ETH_TYPE_APPLETALK_AARP, 2)))||
+               /* eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) || */
+                !memcmp(psnap, rtw_bridge_tunnel_header, SNAP_SIZE)) {
                /* remove RFC1042 or Bridge-Tunnel encapsulation and replace EtherType */
                bsnaphdr = true;
        }
@@ -1915,10 +1804,10 @@ _func_enter_;
        rmv_len = pattrib->hdrlen + pattrib->iv_len +(bsnaphdr?SNAP_SIZE:0);
        len = precvframe->u.hdr.len - rmv_len;
 
-       RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("\n===pattrib->hdrlen: %x,  pattrib->iv_len:%x ===\n\n", pattrib->hdrlen,  pattrib->iv_len));
+       RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("\n ===pattrib->hdrlen: %x,  pattrib->iv_len:%x ===\n\n", pattrib->hdrlen,  pattrib->iv_len));
 
-       memcpy(&eth_type, ptr+rmv_len, 2);
-       eth_type= ntohs((unsigned short )eth_type); //pattrib->ether_type
+       memcpy(&be_tmp, ptr+rmv_len, 2);
+       eth_type = ntohs(be_tmp); /* pattrib->ether_type */
        pattrib->eth_type = eth_type;
 
 #ifdef CONFIG_AUTO_AP_MODE
@@ -1926,7 +1815,7 @@ _func_enter_;
        {
                struct sta_info *psta = precvframe->u.hdr.psta;
 
-               DBG_871X("wlan rx: got eth_type=0x%x\n", pattrib->eth_type);
+               DBG_871X("wlan rx: got eth_type = 0x%x\n", pattrib->eth_type);
 
                if (psta && psta->isrc && psta->pid>0)
                {
@@ -1934,27 +1823,27 @@ _func_enter_;
 
                        rx_pid = *(u16*)(ptr+rmv_len+2);
 
-                       DBG_871X("wlan rx(pid=0x%x): sta("MAC_FMT") pid=0x%x\n",
+                       DBG_871X("wlan rx(pid = 0x%x): sta("MAC_FMT") pid = 0x%x\n",
                                rx_pid, MAC_ARG(psta->hwaddr), psta->pid);
 
-                       if(rx_pid == psta->pid)
+                       if (rx_pid == psta->pid)
                        {
                                int i;
                                u16 len = *(u16*)(ptr+rmv_len+4);
-                               //u16 ctrl_type = *(u16*)(ptr+rmv_len+6);
+                               /* u16 ctrl_type = *(u16*)(ptr+rmv_len+6); */
 
-                               //DBG_871X("RC: len=0x%x, ctrl_type=0x%x\n", len, ctrl_type);
-                               DBG_871X("RC: len=0x%x\n", len);
+                               /* DBG_871X("RC: len = 0x%x, ctrl_type = 0x%x\n", len, ctrl_type); */
+                               DBG_871X("RC: len = 0x%x\n", len);
 
-                               for(i=0;i<len;i++)
+                               for (i = 0;i<len;i++)
                                        DBG_871X("0x%x\n", *(ptr+rmv_len+6+i));
-                                       //DBG_871X("0x%x\n", *(ptr+rmv_len+8+i));
+                                       /* DBG_871X("0x%x\n", *(ptr+rmv_len+8+i)); */
 
                                DBG_871X("RC-end\n");
                        }
                }
        }
-#endif //CONFIG_AUTO_AP_MODE
+#endif /* CONFIG_AUTO_AP_MODE */
 
        if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == true))
        {
@@ -1963,7 +1852,7 @@ _func_enter_;
                *(ptr+1) = 0x12;
 
                eth_type = 0x8712;
-               // append rx status for mp test packets
+               /*  append rx status for mp test packets */
                ptr = recvframe_pull(precvframe, (rmv_len-sizeof(struct ethhdr)+2)-24);
                memcpy(ptr, get_rxmem(precvframe), 24);
                ptr+=24;
@@ -1975,42 +1864,37 @@ _func_enter_;
        memcpy(ptr, pattrib->dst, ETH_ALEN);
        memcpy(ptr+ETH_ALEN, pattrib->src, ETH_ALEN);
 
-       if(!bsnaphdr) {
-               len = htons(len);
-               memcpy(ptr+12, &len, 2);
+       if (!bsnaphdr) {
+               be_tmp = htons(len);
+               memcpy(ptr+12, &be_tmp, 2);
        }
 
-_func_exit_;
        return ret;
-
 }
 
-//perform defrag
-union recv_frame * recvframe_defrag(_adapter *adapter,_queue *defrag_q);
-union recv_frame * recvframe_defrag(_adapter *adapter,_queue *defrag_q)
+/* perform defrag */
+union recv_frame * recvframe_defrag(struct adapter *adapter, struct __queue *defrag_q)
 {
-       _list    *plist, *phead;
-       u8      *data,wlanhdr_offset;
-       u8      curfragnum;
+       struct list_head         *plist, *phead;
+       u8 *data, wlanhdr_offset;
+       u8 curfragnum;
        struct recv_frame_hdr *pfhdr,*pnfhdr;
        union recv_frame* prframe, *pnextrframe;
-       _queue  *pfree_recv_queue;
+       struct __queue  *pfree_recv_queue;
 
-_func_enter_;
-
-       curfragnum=0;
-       pfree_recv_queue=&adapter->recvpriv.free_recv_queue;
+       curfragnum = 0;
+       pfree_recv_queue =&adapter->recvpriv.free_recv_queue;
 
        phead = get_list_head(defrag_q);
        plist = get_next(phead);
        prframe = LIST_CONTAINOR(plist, union recv_frame, u);
-       pfhdr=&prframe->u.hdr;
+       pfhdr =&prframe->u.hdr;
        list_del_init(&(prframe->u.list));
 
-       if(curfragnum!=pfhdr->attrib.frag_num)
+       if (curfragnum!=pfhdr->attrib.frag_num)
        {
-               //the first fragment number must be 0
-               //free the whole queue
+               /* the first fragment number must be 0 */
+               /* free the whole queue */
                rtw_free_recvframe(prframe, pfree_recv_queue);
                rtw_free_recvframe_queue(defrag_q, pfree_recv_queue);
 
@@ -2019,24 +1903,24 @@ _func_enter_;
 
        curfragnum++;
 
-       plist= get_list_head(defrag_q);
+       plist = get_list_head(defrag_q);
 
        plist = get_next(plist);
 
-       data=get_recvframe_data(prframe);
+       data =get_recvframe_data(prframe);
 
-       while(phead != plist)
+       while (phead != plist)
        {
                pnextrframe = LIST_CONTAINOR(plist, union recv_frame , u);
-               pnfhdr=&pnextrframe->u.hdr;
+               pnfhdr =&pnextrframe->u.hdr;
 
 
-               //check the fragment sequence  (2nd ~n fragment frame)
+               /* check the fragment sequence  (2nd ~n fragment frame) */
 
-               if(curfragnum!=pnfhdr->attrib.frag_num)
+               if (curfragnum!=pnfhdr->attrib.frag_num)
                {
-                       //the fragment number must be increasing  (after decache)
-                       //release the defrag_q & prframe
+                       /* the fragment number must be increasing  (after decache) */
+                       /* release the defrag_q & prframe */
                        rtw_free_recvframe(prframe, pfree_recv_queue);
                        rtw_free_recvframe_queue(defrag_q, pfree_recv_queue);
                        return NULL;
@@ -2044,50 +1928,46 @@ _func_enter_;
 
                curfragnum++;
 
-               //copy the 2nd~n fragment frame's payload to the first fragment
-               //get the 2nd~last fragment frame's payload
+               /* copy the 2nd~n fragment frame's payload to the first fragment */
+               /* get the 2nd~last fragment frame's payload */
 
                wlanhdr_offset = pnfhdr->attrib.hdrlen + pnfhdr->attrib.iv_len;
 
                recvframe_pull(pnextrframe, wlanhdr_offset);
 
-               //append  to first fragment frame's tail (if privacy frame, pull the ICV)
+               /* append  to first fragment frame's tail (if privacy frame, pull the ICV) */
                recvframe_pull_tail(prframe, pfhdr->attrib.icv_len);
 
-               //memcpy
+               /* memcpy */
                memcpy(pfhdr->rx_tail, pnfhdr->rx_data, pnfhdr->len);
 
                recvframe_put(prframe, pnfhdr->len);
 
-               pfhdr->attrib.icv_len=pnfhdr->attrib.icv_len;
+               pfhdr->attrib.icv_len =pnfhdr->attrib.icv_len;
                plist = get_next(plist);
 
        };
 
-       //free the defrag_q queue and return the prframe
+       /* free the defrag_q queue and return the prframe */
        rtw_free_recvframe_queue(defrag_q, pfree_recv_queue);
 
-       RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("Performance defrag!!!!!\n"));
-
-_func_exit_;
+       RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("Performance defrag!!!!!\n"));
 
        return prframe;
 }
 
-//check if need to defrag, if needed queue the frame to defrag_q
-union recv_frame* recvframe_chk_defrag(PADAPTER padapter, union recv_frame *precv_frame)
+/* check if need to defrag, if needed queue the frame to defrag_q */
+union recv_frame* recvframe_chk_defrag(struct adapter *padapter, union recv_frame *precv_frame)
 {
-       u8      ismfrag;
-       u8      fragnum;
-       u8      *psta_addr;
+       u8 ismfrag;
+       u8 fragnum;
+       u8 *psta_addr;
        struct recv_frame_hdr *pfhdr;
        struct sta_info *psta;
        struct sta_priv *pstapriv;
-       _list *phead;
+       struct list_head *phead;
        union recv_frame *prtnframe = NULL;
-       _queue *pfree_recv_queue, *pdefrag_q;
-
-_func_enter_;
+       struct __queue *pfree_recv_queue, *pdefrag_q;
 
        pstapriv = &padapter->stapriv;
 
@@ -2095,7 +1975,7 @@ _func_enter_;
 
        pfree_recv_queue = &padapter->recvpriv.free_recv_queue;
 
-       //need to define struct of wlan header frame ctrl
+       /* need to define struct of wlan header frame ctrl */
        ismfrag = pfhdr->attrib.mfrag;
        fragnum = pfhdr->attrib.frag_num;
 
@@ -2113,111 +1993,107 @@ _func_enter_;
        else
                pdefrag_q = &psta->sta_recvpriv.defrag_q;
 
-       if ((ismfrag==0) && (fragnum==0))
+       if ((ismfrag == 0) && (fragnum == 0))
        {
-               prtnframe = precv_frame;//isn't a fragment frame
+               prtnframe = precv_frame;/* isn't a fragment frame */
        }
 
-       if (ismfrag==1)
+       if (ismfrag == 1)
        {
-               //0~(n-1) fragment frame
-               //enqueue to defraf_g
-               if(pdefrag_q != NULL)
+               /* 0~(n-1) fragment frame */
+               /* enqueue to defraf_g */
+               if (pdefrag_q != NULL)
                {
-                       if(fragnum==0)
+                       if (fragnum == 0)
                        {
-                               //the first fragment
-                               if(!list_empty(&pdefrag_q->queue))
+                               /* the first fragment */
+                               if (!list_empty(&pdefrag_q->queue))
                                {
-                                       //free current defrag_q
+                                       /* free current defrag_q */
                                        rtw_free_recvframe_queue(pdefrag_q, pfree_recv_queue);
                                }
                        }
 
 
-                       //Then enqueue the 0~(n-1) fragment into the defrag_q
+                       /* Then enqueue the 0~(n-1) fragment into the defrag_q */
 
-                       //spin_lock(&pdefrag_q->lock);
+                       /* spin_lock(&pdefrag_q->lock); */
                        phead = get_list_head(pdefrag_q);
                        list_add_tail(&pfhdr->list, phead);
-                       //spin_unlock(&pdefrag_q->lock);
+                       /* spin_unlock(&pdefrag_q->lock); */
 
-                       RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("Enqueuq: ismfrag = %d, fragnum= %d\n", ismfrag,fragnum));
+                       RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("Enqueuq: ismfrag = %d, fragnum = %d\n", ismfrag, fragnum));
 
-                       prtnframe=NULL;
+                       prtnframe = NULL;
 
                }
                else
                {
-                       //can't find this ta's defrag_queue, so free this recv_frame
+                       /* can't find this ta's defrag_queue, so free this recv_frame */
                        rtw_free_recvframe(precv_frame, pfree_recv_queue);
-                       prtnframe=NULL;
-                       RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("Free because pdefrag_q ==NULL: ismfrag = %d, fragnum= %d\n", ismfrag, fragnum));
+                       prtnframe = NULL;
+                       RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("Free because pdefrag_q == NULL: ismfrag = %d, fragnum = %d\n", ismfrag, fragnum));
                }
 
        }
 
-       if((ismfrag==0)&&(fragnum!=0))
+       if ((ismfrag == 0) && (fragnum!= 0))
        {
-               //the last fragment frame
-               //enqueue the last fragment
-               if(pdefrag_q != NULL)
+               /* the last fragment frame */
+               /* enqueue the last fragment */
+               if (pdefrag_q != NULL)
                {
-                       //spin_lock(&pdefrag_q->lock);
+                       /* spin_lock(&pdefrag_q->lock); */
                        phead = get_list_head(pdefrag_q);
-                       list_add_tail(&pfhdr->list,phead);
-                       //spin_unlock(&pdefrag_q->lock);
+                       list_add_tail(&pfhdr->list, phead);
+                       /* spin_unlock(&pdefrag_q->lock); */
 
-                       //call recvframe_defrag to defrag
-                       RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("defrag: ismfrag = %d, fragnum= %d\n", ismfrag, fragnum));
+                       /* call recvframe_defrag to defrag */
+                       RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("defrag: ismfrag = %d, fragnum = %d\n", ismfrag, fragnum));
                        precv_frame = recvframe_defrag(padapter, pdefrag_q);
-                       prtnframe=precv_frame;
+                       prtnframe =precv_frame;
 
                }
                else
                {
-                       //can't find this ta's defrag_queue, so free this recv_frame
+                       /* can't find this ta's defrag_queue, so free this recv_frame */
                        rtw_free_recvframe(precv_frame, pfree_recv_queue);
-                       prtnframe=NULL;
-                       RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("Free because pdefrag_q ==NULL: ismfrag = %d, fragnum= %d\n", ismfrag,fragnum));
+                       prtnframe = NULL;
+                       RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("Free because pdefrag_q == NULL: ismfrag = %d, fragnum = %d\n", ismfrag, fragnum));
                }
 
        }
 
 
-       if((prtnframe!=NULL)&&(prtnframe->u.hdr.attrib.privacy))
+       if ((prtnframe!= NULL) && (prtnframe->u.hdr.attrib.privacy))
        {
-               //after defrag we must check tkip mic code
-               if(recvframe_chkmic(padapter,  prtnframe)==_FAIL)
+               /* after defrag we must check tkip mic code */
+               if (recvframe_chkmic(padapter,  prtnframe) == _FAIL)
                {
-                       RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvframe_chkmic(padapter,  prtnframe)==_FAIL\n"));
-                       rtw_free_recvframe(prtnframe,pfree_recv_queue);
-                       prtnframe=NULL;
+                       RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("recvframe_chkmic(padapter,  prtnframe) == _FAIL\n"));
+                       rtw_free_recvframe(prtnframe, pfree_recv_queue);
+                       prtnframe = NULL;
                }
        }
-
-_func_exit_;
-
        return prtnframe;
-
 }
 
-static int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
+static int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe)
 {
        int     a_len, padding_len;
-       u16     nSubframe_Length;
-       u8      nr_subframes, i;
-       u8      *pdata;
+       u16 nSubframe_Length;
+       u8 nr_subframes, i;
+       u8 *pdata;
        _pkt *sub_pkt,*subframes[MAX_SUBFRAME_COUNT];
        struct recv_priv *precvpriv = &padapter->recvpriv;
-       _queue *pfree_recv_queue = &(precvpriv->free_recv_queue);
+       struct __queue *pfree_recv_queue = &(precvpriv->free_recv_queue);
        int     ret = _SUCCESS;
 
        nr_subframes = 0;
 
        recvframe_pull(prframe, prframe->u.hdr.attrib.hdrlen);
 
-       if(prframe->u.hdr.attrib.iv_len >0)
+       if (prframe->u.hdr.attrib.iv_len >0)
        {
                recvframe_pull(prframe, prframe->u.hdr.attrib.iv_len);
        }
@@ -2226,19 +2102,19 @@ static int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
 
        pdata = prframe->u.hdr.rx_data;
 
-       while(a_len > ETH_HLEN) {
+       while (a_len > ETH_HLEN) {
 
                /* Offset 12 denote 2 mac address */
                nSubframe_Length = RTW_GET_BE16(pdata + 12);
 
-               if( a_len < (ETHERNET_HEADER_SIZE + nSubframe_Length) ) {
-                       DBG_871X("nRemain_Length is %d and nSubframe_Length is : %d\n",a_len,nSubframe_Length);
+               if (a_len < (ETHERNET_HEADER_SIZE + nSubframe_Length)) {
+                       DBG_871X("nRemain_Length is %d and nSubframe_Length is : %d\n", a_len, nSubframe_Length);
                        break;
                }
 
                sub_pkt = rtw_os_alloc_msdu_pkt(prframe, nSubframe_Length, pdata);
                if (sub_pkt == NULL) {
-                       DBG_871X("%s(): allocate sub packet fail !!!\n",__FUNCTION__);
+                       DBG_871X("%s(): allocate sub packet fail !!!\n", __func__);
                        break;
                }
 
@@ -2248,20 +2124,20 @@ static int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
 
                subframes[nr_subframes++] = sub_pkt;
 
-               if(nr_subframes >= MAX_SUBFRAME_COUNT) {
+               if (nr_subframes >= MAX_SUBFRAME_COUNT) {
                        DBG_871X("ParseSubframe(): Too many Subframes! Packets dropped!\n");
                        break;
                }
 
                pdata += nSubframe_Length;
                a_len -= nSubframe_Length;
-               if(a_len != 0) {
+               if (a_len != 0) {
                        padding_len = 4 - ((nSubframe_Length + ETH_HLEN) & (4-1));
-                       if(padding_len == 4) {
+                       if (padding_len == 4) {
                                padding_len = 0;
                        }
 
-                       if(a_len < padding_len) {
+                       if (a_len < padding_len) {
                                DBG_871X("ParseSubframe(): a_len < padding_len !\n");
                                break;
                        }
@@ -2270,7 +2146,7 @@ static int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
                }
        }
 
-       for(i=0; i<nr_subframes; i++){
+       for (i = 0; i<nr_subframes; i++) {
                sub_pkt = subframes[i];
 
                /* Indicat the packets to upper layer */
@@ -2280,7 +2156,7 @@ static int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
        }
 
        prframe->u.hdr.len = 0;
-       rtw_free_recvframe(prframe, pfree_recv_queue);//free this recv_frame
+       rtw_free_recvframe(prframe, pfree_recv_queue);/* free this recv_frame */
 
        return ret;
 }
@@ -2288,34 +2164,34 @@ static int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
 int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num);
 int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num)
 {
-       PADAPTER padapter = preorder_ctrl->padapter;
+       struct adapter *padapter = preorder_ctrl->padapter;
        struct dvobj_priv *psdpriv = padapter->dvobj;
        struct debug_priv *pdbgpriv = &psdpriv->drv_dbg;
-       u8      wsize = preorder_ctrl->wsize_b;
-       u16     wend = (preorder_ctrl->indicate_seq + wsize -1) & 0xFFF;//% 4096;
+       u8 wsize = preorder_ctrl->wsize_b;
+       u16 wend = (preorder_ctrl->indicate_seq + wsize -1) & 0xFFF;/*  4096; */
 
-       // Rx Reorder initialize condition.
+       /*  Rx Reorder initialize condition. */
        if (preorder_ctrl->indicate_seq == 0xFFFF)
        {
                preorder_ctrl->indicate_seq = seq_num;
                #ifdef DBG_RX_SEQ
-               DBG_871X("DBG_RX_SEQ %s:%d init IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
+               DBG_871X("DBG_RX_SEQ %s:%d init IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
                        preorder_ctrl->indicate_seq, seq_num);
                #endif
 
-               //DbgPrint("check_indicate_seq, 1st->indicate_seq=%d\n", precvpriv->indicate_seq);
+               /* DbgPrint("check_indicate_seq, 1st->indicate_seq =%d\n", precvpriv->indicate_seq); */
        }
 
-       //DbgPrint("enter->check_indicate_seq(): IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num);
+       /* DbgPrint("enter->check_indicate_seq(): IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num); */
 
-       // Drop out the packet which SeqNum is smaller than WinStart
-       if( SN_LESS(seq_num, preorder_ctrl->indicate_seq) )
+       /*  Drop out the packet which SeqNum is smaller than WinStart */
+       if (SN_LESS(seq_num, preorder_ctrl->indicate_seq))
        {
-               //RT_TRACE(COMP_RX_REORDER, DBG_LOUD, ("CheckRxTsIndicateSeq(): Packet Drop! IndicateSeq: %d, NewSeq: %d\n", pTS->RxIndicateSeq, NewSeqNum));
-               //DbgPrint("CheckRxTsIndicateSeq(): Packet Drop! IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num);
+               /* RT_TRACE(COMP_RX_REORDER, DBG_LOUD, ("CheckRxTsIndicateSeq(): Packet Drop! IndicateSeq: %d, NewSeq: %d\n", pTS->RxIndicateSeq, NewSeqNum)); */
+               /* DbgPrint("CheckRxTsIndicateSeq(): Packet Drop! IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num); */
 
                #ifdef DBG_RX_DROP_FRAME
-               DBG_871X("%s IndicateSeq: %d > NewSeq: %d\n", __FUNCTION__,
+               DBG_871X("%s IndicateSeq: %d > NewSeq: %d\n", __func__,
                        preorder_ctrl->indicate_seq, seq_num);
                #endif
 
@@ -2323,38 +2199,38 @@ int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num)
                return false;
        }
 
-       //
-       // Sliding window manipulation. Conditions includes:
-       // 1. Incoming SeqNum is equal to WinStart =>Window shift 1
-       // 2. Incoming SeqNum is larger than the WinEnd => Window shift N
-       //
-       if( SN_EQUAL(seq_num, preorder_ctrl->indicate_seq) )
+       /*  */
+       /*  Sliding window manipulation. Conditions includes: */
+       /*  1. Incoming SeqNum is equal to WinStart =>Window shift 1 */
+       /*  2. Incoming SeqNum is larger than the WinEnd => Window shift N */
+       /*  */
+       if (SN_EQUAL(seq_num, preorder_ctrl->indicate_seq))
        {
                preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) & 0xFFF;
 
                #ifdef DBG_RX_SEQ
-               DBG_871X("DBG_RX_SEQ %s:%d SN_EQUAL IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
+               DBG_871X("DBG_RX_SEQ %s:%d SN_EQUAL IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
                        preorder_ctrl->indicate_seq, seq_num);
                #endif
        }
-       else if(SN_LESS(wend, seq_num))
+       else if (SN_LESS(wend, seq_num))
        {
-               //RT_TRACE(COMP_RX_REORDER, DBG_LOUD, ("CheckRxTsIndicateSeq(): Window Shift! IndicateSeq: %d, NewSeq: %d\n", pTS->RxIndicateSeq, NewSeqNum));
-               //DbgPrint("CheckRxTsIndicateSeq(): Window Shift! IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num);
+               /* RT_TRACE(COMP_RX_REORDER, DBG_LOUD, ("CheckRxTsIndicateSeq(): Window Shift! IndicateSeq: %d, NewSeq: %d\n", pTS->RxIndicateSeq, NewSeqNum)); */
+               /* DbgPrint("CheckRxTsIndicateSeq(): Window Shift! IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num); */
 
-               // boundary situation, when seq_num cross 0xFFF
-               if(seq_num >= (wsize - 1))
+               /*  boundary situation, when seq_num cross 0xFFF */
+               if (seq_num >= (wsize - 1))
                        preorder_ctrl->indicate_seq = seq_num + 1 -wsize;
                else
                        preorder_ctrl->indicate_seq = 0xFFF - (wsize - (seq_num + 1)) + 1;
                pdbgpriv->dbg_rx_ampdu_window_shift_cnt++;
                #ifdef DBG_RX_SEQ
-               DBG_871X("DBG_RX_SEQ %s:%d SN_LESS(wend, seq_num) IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
+               DBG_871X("DBG_RX_SEQ %s:%d SN_LESS(wend, seq_num) IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
                        preorder_ctrl->indicate_seq, seq_num);
                #endif
        }
 
-       //DbgPrint("exit->check_indicate_seq(): IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num);
+       /* DbgPrint("exit->check_indicate_seq(): IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num); */
 
        return true;
 }
@@ -2363,15 +2239,15 @@ int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union rec
 int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union recv_frame *prframe)
 {
        struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib;
-       _queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
-       _list   *phead, *plist;
+       struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
+       struct list_head        *phead, *plist;
        union recv_frame *pnextrframe;
        struct rx_pkt_attrib *pnextattrib;
 
-       //DbgPrint("+enqueue_reorder_recvframe()\n");
+       /* DbgPrint("+enqueue_reorder_recvframe()\n"); */
 
-       //spin_lock_irqsave(&ppending_recvframe_queue->lock, irql);
-       //spin_lock(&ppending_recvframe_queue->lock);
+       /* spin_lock_irqsave(&ppending_recvframe_queue->lock, irql); */
+       /* spin_lock(&ppending_recvframe_queue->lock); */
 
 
        phead = get_list_head(ppending_recvframe_queue);
@@ -2382,16 +2258,16 @@ int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union rec
                pnextrframe = LIST_CONTAINOR(plist, union recv_frame, u);
                pnextattrib = &pnextrframe->u.hdr.attrib;
 
-               if(SN_LESS(pnextattrib->seq_num, pattrib->seq_num))
+               if (SN_LESS(pnextattrib->seq_num, pattrib->seq_num))
                {
                        plist = get_next(plist);
                }
-               else ifSN_EQUAL(pnextattrib->seq_num, pattrib->seq_num))
+               else if (SN_EQUAL(pnextattrib->seq_num, pattrib->seq_num))
                {
-                       //Duplicate entry is found!! Do not insert current entry.
-                       //RT_TRACE(COMP_RX_REORDER, DBG_TRACE, ("InsertRxReorderList(): Duplicate packet is dropped!! IndicateSeq: %d, NewSeq: %d\n", pTS->RxIndicateSeq, SeqNum));
+                       /* Duplicate entry is found!! Do not insert current entry. */
+                       /* RT_TRACE(COMP_RX_REORDER, DBG_TRACE, ("InsertRxReorderList(): Duplicate packet is dropped!! IndicateSeq: %d, NewSeq: %d\n", pTS->RxIndicateSeq, SeqNum)); */
 
-                       //spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql);
+                       /* spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql); */
 
                        return false;
                }
@@ -2400,23 +2276,23 @@ int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union rec
                        break;
                }
 
-               //DbgPrint("enqueue_reorder_recvframe():while\n");
+               /* DbgPrint("enqueue_reorder_recvframe():while\n"); */
 
        }
 
 
-       //spin_lock_irqsave(&ppending_recvframe_queue->lock, irql);
-       //spin_lock(&ppending_recvframe_queue->lock);
+       /* spin_lock_irqsave(&ppending_recvframe_queue->lock, irql); */
+       /* spin_lock(&ppending_recvframe_queue->lock); */
 
        list_del_init(&(prframe->u.hdr.list));
 
        list_add_tail(&(prframe->u.hdr.list), plist);
 
-       //spin_unlock(&ppending_recvframe_queue->lock);
-       //spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql);
+       /* spin_unlock(&ppending_recvframe_queue->lock); */
+       /* spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql); */
 
 
-       //RT_TRACE(COMP_RX_REORDER, DBG_TRACE, ("InsertRxReorderList(): Pkt insert into buffer!! IndicateSeq: %d, NewSeq: %d\n", pTS->RxIndicateSeq, SeqNum));
+       /* RT_TRACE(COMP_RX_REORDER, DBG_TRACE, ("InsertRxReorderList(): Pkt insert into buffer!! IndicateSeq: %d, NewSeq: %d\n", pTS->RxIndicateSeq, SeqNum)); */
        return true;
 
 }
@@ -2424,7 +2300,7 @@ int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union rec
 void recv_indicatepkts_pkt_loss_cnt(struct debug_priv *pdbgpriv, u64 prev_seq, u64 current_seq);
 void recv_indicatepkts_pkt_loss_cnt(struct debug_priv *pdbgpriv, u64 prev_seq, u64 current_seq)
 {
-       if(current_seq < prev_seq)
+       if (current_seq < prev_seq)
        {
                pdbgpriv->dbg_rx_ampdu_loss_count+= (4096 + current_seq - prev_seq);
 
@@ -2434,39 +2310,37 @@ void recv_indicatepkts_pkt_loss_cnt(struct debug_priv *pdbgpriv, u64 prev_seq, u
                pdbgpriv->dbg_rx_ampdu_loss_count+= (current_seq - prev_seq);
        }
 }
-int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced);
-int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced)
+int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced);
+int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced)
 {
-       //_irqL irql;
-       //u8 bcancelled;
-       _list   *phead, *plist;
+       struct list_head        *phead, *plist;
        union recv_frame *prframe;
        struct rx_pkt_attrib *pattrib;
-       //u8 index = 0;
+       /* u8 index = 0; */
        int bPktInBuf = false;
        struct recv_priv *precvpriv = &padapter->recvpriv;
-       _queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
+       struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
        struct dvobj_priv *psdpriv = padapter->dvobj;
        struct debug_priv *pdbgpriv = &psdpriv->drv_dbg;
 
        DBG_COUNTER(padapter->rx_logs.core_rx_post_indicate_in_oder);
 
-       //DbgPrint("+recv_indicatepkts_in_order\n");
+       /* DbgPrint("+recv_indicatepkts_in_order\n"); */
 
-       //spin_lock_irqsave(&ppending_recvframe_queue->lock, irql);
-       //spin_lock(&ppending_recvframe_queue->lock);
+       /* spin_lock_irqsave(&ppending_recvframe_queue->lock, irql); */
+       /* spin_lock(&ppending_recvframe_queue->lock); */
 
-       phead =         get_list_head(ppending_recvframe_queue);
+       phead =         get_list_head(ppending_recvframe_queue);
        plist = get_next(phead);
 
-       // Handling some condition for forced indicate case.
-       if(bforced==true)
+       /*  Handling some condition for forced indicate case. */
+       if (bforced ==true)
        {
                pdbgpriv->dbg_rx_ampdu_forced_indicate_count++;
-               if(list_empty(phead))
+               if (list_empty(phead))
                {
-                       // spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql);
-                       //spin_unlock(&ppending_recvframe_queue->lock);
+                       /*  spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql); */
+                       /* spin_unlock(&ppending_recvframe_queue->lock); */
                        return true;
                }
 
@@ -2474,75 +2348,75 @@ int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *pre
                pattrib = &prframe->u.hdr.attrib;
 
                #ifdef DBG_RX_SEQ
-               DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
+               DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
                        preorder_ctrl->indicate_seq, pattrib->seq_num);
                #endif
-               recv_indicatepkts_pkt_loss_cnt(pdbgpriv,preorder_ctrl->indicate_seq,pattrib->seq_num);
+               recv_indicatepkts_pkt_loss_cnt(pdbgpriv, preorder_ctrl->indicate_seq, pattrib->seq_num);
                preorder_ctrl->indicate_seq = pattrib->seq_num;
 
        }
 
-       // Prepare indication list and indication.
-       // Check if there is any packet need indicate.
-       while(!list_empty(phead))
+       /*  Prepare indication list and indication. */
+       /*  Check if there is any packet need indicate. */
+       while (!list_empty(phead))
        {
 
                prframe = LIST_CONTAINOR(plist, union recv_frame, u);
                pattrib = &prframe->u.hdr.attrib;
 
-               if(!SN_LESS(preorder_ctrl->indicate_seq, pattrib->seq_num))
+               if (!SN_LESS(preorder_ctrl->indicate_seq, pattrib->seq_num))
                {
                        RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_,
-                                ("recv_indicatepkts_in_order: indicate=%d seq=%d amsdu=%d\n",
+                                ("recv_indicatepkts_in_order: indicate =%d seq =%d amsdu =%d\n",
                                  preorder_ctrl->indicate_seq, pattrib->seq_num, pattrib->amsdu));
 
                        plist = get_next(plist);
                        list_del_init(&(prframe->u.hdr.list));
 
-                       if(SN_EQUAL(preorder_ctrl->indicate_seq, pattrib->seq_num))
+                       if (SN_EQUAL(preorder_ctrl->indicate_seq, pattrib->seq_num))
                        {
                                preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) & 0xFFF;
                                #ifdef DBG_RX_SEQ
-                               DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
+                               DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
                                        preorder_ctrl->indicate_seq, pattrib->seq_num);
                                #endif
                        }
 
-                       //Set this as a lock to make sure that only one thread is indicating packet.
-                       //pTS->RxIndicateState = RXTS_INDICATE_PROCESSING;
+                       /* Set this as a lock to make sure that only one thread is indicating packet. */
+                       /* pTS->RxIndicateState = RXTS_INDICATE_PROCESSING; */
 
-                       // Indicate packets
-                       //RT_ASSERT((index<=REORDER_WIN_SIZE), ("RxReorderIndicatePacket(): Rx Reorder buffer full!! \n"));
+                       /*  Indicate packets */
+                       /* RT_ASSERT((index<=REORDER_WIN_SIZE), ("RxReorderIndicatePacket(): Rx Reorder buffer full!!\n")); */
 
 
-                       //indicate this recv_frame
-                       //DbgPrint("recv_indicatepkts_in_order, indicate_seq=%d, seq_num=%d\n", precvpriv->indicate_seq, pattrib->seq_num);
-                       if(!pattrib->amsdu)
+                       /* indicate this recv_frame */
+                       /* DbgPrint("recv_indicatepkts_in_order, indicate_seq =%d, seq_num =%d\n", precvpriv->indicate_seq, pattrib->seq_num); */
+                       if (!pattrib->amsdu)
                        {
-                               //DBG_871X("recv_indicatepkts_in_order, amsdu!=1, indicate_seq=%d, seq_num=%d\n", preorder_ctrl->indicate_seq, pattrib->seq_num);
+                               /* DBG_871X("recv_indicatepkts_in_order, amsdu!= 1, indicate_seq =%d, seq_num =%d\n", preorder_ctrl->indicate_seq, pattrib->seq_num); */
 
                                if ((padapter->bDriverStopped == false) &&
                                    (padapter->bSurpriseRemoved == false))
                                {
 
-                                       rtw_recv_indicatepkt(padapter, prframe);//indicate this recv_frame
+                                       rtw_recv_indicatepkt(padapter, prframe);/* indicate this recv_frame */
 
                                }
                        }
-                       else if(pattrib->amsdu==1)
+                       else if (pattrib->amsdu == 1)
                        {
-                               if(amsdu_to_msdu(padapter, prframe)!=_SUCCESS)
+                               if (amsdu_to_msdu(padapter, prframe)!= _SUCCESS)
                                {
                                        rtw_free_recvframe(prframe, &precvpriv->free_recv_queue);
                                }
                        }
                        else
                        {
-                               //error condition;
+                               /* error condition; */
                        }
 
 
-                       //Update local variables.
+                       /* Update local variables. */
                        bPktInBuf = false;
 
                }
@@ -2552,61 +2426,39 @@ int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *pre
                        break;
                }
 
-               //DbgPrint("recv_indicatepkts_in_order():while\n");
+               /* DbgPrint("recv_indicatepkts_in_order():while\n"); */
 
        }
 
-       //spin_unlock(&ppending_recvframe_queue->lock);
-       //spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql);
-
-/*
-       //Release the indication lock and set to new indication step.
-       if(bPktInBuf)
-       {
-               // Set new pending timer.
-               //pTS->RxIndicateState = RXTS_INDICATE_REORDER;
-               //PlatformSetTimer(Adapter, &pTS->RxPktPendingTimer, pHTInfo->RxReorderPendingTime);
-               //DBG_871X("_set_timer(&preorder_ctrl->reordering_ctrl_timer, REORDER_WAIT_TIME)\n");
-               _set_timer(&preorder_ctrl->reordering_ctrl_timer, REORDER_WAIT_TIME);
-       }
-       else
-       {
-               //pTS->RxIndicateState = RXTS_INDICATE_IDLE;
-       }
-*/
-       //spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql);
+       /* spin_unlock(&ppending_recvframe_queue->lock); */
+       /* spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql); */
 
-       //return true;
        return bPktInBuf;
-
 }
 
-int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe);
-int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
+int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *prframe);
+int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *prframe)
 {
-       _irqL irql;
        int retval = _SUCCESS;
        struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib;
        struct recv_reorder_ctrl *preorder_ctrl = prframe->u.hdr.preorder_ctrl;
-       _queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
+       struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
        struct dvobj_priv *psdpriv = padapter->dvobj;
        struct debug_priv *pdbgpriv = &psdpriv->drv_dbg;
 
        DBG_COUNTER(padapter->rx_logs.core_rx_post_indicate_reoder);
 
-       if(!pattrib->amsdu)
+       if (!pattrib->amsdu)
        {
-               //s1.
+               /* s1. */
                wlanhdr_to_ethhdr(prframe);
 
-               //if ((pattrib->qos!=1) /*|| pattrib->priority!=0 || IS_MCAST(pattrib->ra)*/
-               //      || (pattrib->eth_type==0x0806) || (pattrib->ack_policy!=0))
-               if (pattrib->qos!=1)
+               if (pattrib->qos!= 1)
                {
                        if ((padapter->bDriverStopped == false) &&
                            (padapter->bSurpriseRemoved == false))
                        {
-                               RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("@@@@  recv_indicatepkt_reorder -recv_func recv_indicatepkt\n" ));
+                               RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("@@@@  recv_indicatepkt_reorder -recv_func recv_indicatepkt\n"));
 
                                rtw_recv_indicatepkt(padapter, prframe);
                                return _SUCCESS;
@@ -2614,7 +2466,7 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
                        }
 
                        #ifdef DBG_RX_DROP_FRAME
-                       DBG_871X("DBG_RX_DROP_FRAME %s pattrib->qos !=1\n", __FUNCTION__);
+                       DBG_871X("DBG_RX_DROP_FRAME %s pattrib->qos != 1\n", __func__);
                        #endif
 
                        return _FAIL;
@@ -2623,10 +2475,10 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
 
                if (preorder_ctrl->enable == false)
                {
-                       //indicate this recv_frame
+                       /* indicate this recv_frame */
                        preorder_ctrl->indicate_seq = pattrib->seq_num;
                        #ifdef DBG_RX_SEQ
-                       DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
+                       DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
                                preorder_ctrl->indicate_seq, pattrib->seq_num);
                        #endif
 
@@ -2634,20 +2486,20 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
 
                        preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1)%4096;
                        #ifdef DBG_RX_SEQ
-                       DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
+                       DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
                                preorder_ctrl->indicate_seq, pattrib->seq_num);
                        #endif
 
                        return _SUCCESS;
                }
        }
-       else if(pattrib->amsdu==1) //temp filter -> means didn't support A-MSDUs in a A-MPDU
+       else if (pattrib->amsdu == 1) /* temp filter -> means didn't support A-MSDUs in a A-MPDU */
        {
                if (preorder_ctrl->enable == false)
                {
                        preorder_ctrl->indicate_seq = pattrib->seq_num;
                        #ifdef DBG_RX_SEQ
-                       DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
+                       DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
                                preorder_ctrl->indicate_seq, pattrib->seq_num);
                        #endif
 
@@ -2655,13 +2507,13 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
 
                        preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1)%4096;
                        #ifdef DBG_RX_SEQ
-                       DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
+                       DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
                                preorder_ctrl->indicate_seq, pattrib->seq_num);
                        #endif
 
-                       if(retval != _SUCCESS){
+                       if (retval != _SUCCESS) {
                                #ifdef DBG_RX_DROP_FRAME
-                               DBG_871X("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __FUNCTION__);
+                               DBG_871X("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __func__);
                                #endif
                        }
 
@@ -2672,51 +2524,45 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
        spin_lock_bh(&ppending_recvframe_queue->lock);
 
        RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_,
-                ("recv_indicatepkt_reorder: indicate=%d seq=%d\n",
+                ("recv_indicatepkt_reorder: indicate =%d seq =%d\n",
                  preorder_ctrl->indicate_seq, pattrib->seq_num));
 
-       //s2. check if winstart_b(indicate_seq) needs to been updated
-       if(!check_indicate_seq(preorder_ctrl, pattrib->seq_num))
+       /* s2. check if winstart_b(indicate_seq) needs to been updated */
+       if (!check_indicate_seq(preorder_ctrl, pattrib->seq_num))
        {
                pdbgpriv->dbg_rx_ampdu_drop_count++;
-               //pHTInfo->RxReorderDropCounter++;
-               //ReturnRFDList(Adapter, pRfd);
-               //RT_TRACE(COMP_RX_REORDER, DBG_TRACE, ("RxReorderIndicatePacket() ==> Packet Drop!!\n"));
-               //spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql);
-               //return _FAIL;
-
                #ifdef DBG_RX_DROP_FRAME
-               DBG_871X("DBG_RX_DROP_FRAME %s check_indicate_seq fail\n", __FUNCTION__);
+               DBG_871X("DBG_RX_DROP_FRAME %s check_indicate_seq fail\n", __func__);
                #endif
                goto _err_exit;
        }
 
 
-       //s3. Insert all packet into Reorder Queue to maintain its ordering.
-       if(!enqueue_reorder_recvframe(preorder_ctrl, prframe))
+       /* s3. Insert all packet into Reorder Queue to maintain its ordering. */
+       if (!enqueue_reorder_recvframe(preorder_ctrl, prframe))
        {
-               //DbgPrint("recv_indicatepkt_reorder, enqueue_reorder_recvframe fail!\n");
-               //spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql);
-               //return _FAIL;
+               /* DbgPrint("recv_indicatepkt_reorder, enqueue_reorder_recvframe fail!\n"); */
+               /* spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql); */
+               /* return _FAIL; */
                #ifdef DBG_RX_DROP_FRAME
-               DBG_871X("DBG_RX_DROP_FRAME %s enqueue_reorder_recvframe fail\n", __FUNCTION__);
+               DBG_871X("DBG_RX_DROP_FRAME %s enqueue_reorder_recvframe fail\n", __func__);
                #endif
                goto _err_exit;
        }
 
 
-       //s4.
-       // Indication process.
-       // After Packet dropping and Sliding Window shifting as above, we can now just indicate the packets
-       // with the SeqNum smaller than latest WinStart and buffer other packets.
-       //
-       // For Rx Reorder condition:
-       // 1. All packets with SeqNum smaller than WinStart => Indicate
-       // 2. All packets with SeqNum larger than or equal to WinStart => Buffer it.
-       //
+       /* s4. */
+       /*  Indication process. */
+       /*  After Packet dropping and Sliding Window shifting as above, we can now just indicate the packets */
+       /*  with the SeqNum smaller than latest WinStart and buffer other packets. */
+       /*  */
+       /*  For Rx Reorder condition: */
+       /*  1. All packets with SeqNum smaller than WinStart => Indicate */
+       /*  2. All packets with SeqNum larger than or equal to WinStart => Buffer it. */
+       /*  */
 
-       //recv_indicatepkts_in_order(padapter, preorder_ctrl, true);
-       if(recv_indicatepkts_in_order(padapter, preorder_ctrl, false)==true)
+       /* recv_indicatepkts_in_order(padapter, preorder_ctrl, true); */
+       if (recv_indicatepkts_in_order(padapter, preorder_ctrl, false) ==true)
        {
                _set_timer(&preorder_ctrl->reordering_ctrl_timer, REORDER_WAIT_TIME);
                spin_unlock_bh(&ppending_recvframe_queue->lock);
@@ -2724,7 +2570,7 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
        else
        {
                spin_unlock_bh(&ppending_recvframe_queue->lock);
-               _cancel_timer_ex(&preorder_ctrl->reordering_ctrl_timer);
+               del_timer_sync(&preorder_ctrl->reordering_ctrl_timer);
        }
 
        return _SUCCESS;
@@ -2739,22 +2585,21 @@ _err_exit:
 
 void rtw_reordering_ctrl_timeout_handler(void *pcontext)
 {
-       _irqL irql;
        struct recv_reorder_ctrl *preorder_ctrl = (struct recv_reorder_ctrl *)pcontext;
-       _adapter *padapter = preorder_ctrl->padapter;
-       _queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
+       struct adapter *padapter = preorder_ctrl->padapter;
+       struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
 
 
-       if(padapter->bDriverStopped ||padapter->bSurpriseRemoved)
+       if (padapter->bDriverStopped ||padapter->bSurpriseRemoved)
        {
                return;
        }
 
-       //DBG_871X("+rtw_reordering_ctrl_timeout_handler()=>\n");
+       /* DBG_871X("+rtw_reordering_ctrl_timeout_handler() =>\n"); */
 
        spin_lock_bh(&ppending_recvframe_queue->lock);
 
-       if(recv_indicatepkts_in_order(padapter, preorder_ctrl, true)==true)
+       if (recv_indicatepkts_in_order(padapter, preorder_ctrl, true) ==true)
        {
                _set_timer(&preorder_ctrl->reordering_ctrl_timer, REORDER_WAIT_TIME);
        }
@@ -2763,25 +2608,25 @@ void rtw_reordering_ctrl_timeout_handler(void *pcontext)
 
 }
 
-int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe);
-int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe)
+int process_recv_indicatepkts(struct adapter *padapter, union recv_frame *prframe);
+int process_recv_indicatepkts(struct adapter *padapter, union recv_frame *prframe)
 {
        int retval = _SUCCESS;
-       //struct recv_priv *precvpriv = &padapter->recvpriv;
-       //struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib;
-       struct mlme_priv        *pmlmepriv = &padapter->mlmepriv;
-       struct ht_priv  *phtpriv = &pmlmepriv->htpriv;
+       /* struct recv_priv *precvpriv = &padapter->recvpriv; */
+       /* struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib; */
+       struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
+       struct ht_priv *phtpriv = &pmlmepriv->htpriv;
 
        DBG_COUNTER(padapter->rx_logs.core_rx_post_indicate);
 
-       if(phtpriv->ht_option==true)  //B/G/N Mode
+       if (phtpriv->ht_option ==true)  /* B/G/N Mode */
        {
-               //prframe->u.hdr.preorder_ctrl = &precvpriv->recvreorder_ctrl[pattrib->priority];
+               /* prframe->u.hdr.preorder_ctrl = &precvpriv->recvreorder_ctrl[pattrib->priority]; */
 
-               if(recv_indicatepkt_reorder(padapter, prframe)!=_SUCCESS)// including perform A-MPDU Rx Ordering Buffer Control
+               if (recv_indicatepkt_reorder(padapter, prframe)!= _SUCCESS)/*  including perform A-MPDU Rx Ordering Buffer Control */
                {
                        #ifdef DBG_RX_DROP_FRAME
-                       DBG_871X("DBG_RX_DROP_FRAME %s recv_indicatepkt_reorder error!\n", __FUNCTION__);
+                       DBG_871X("DBG_RX_DROP_FRAME %s recv_indicatepkt_reorder error!\n", __func__);
                        #endif
 
                        if ((padapter->bDriverStopped == false) &&
@@ -2792,29 +2637,29 @@ int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe)
                        }
                }
        }
-       else //B/G mode
+       else /* B/G mode */
        {
-               retval=wlanhdr_to_ethhdr (prframe);
-               if(retval != _SUCCESS)
+               retval =wlanhdr_to_ethhdr (prframe);
+               if (retval != _SUCCESS)
                {
-                       RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("wlanhdr_to_ethhdr: drop pkt \n"));
+                       RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("wlanhdr_to_ethhdr: drop pkt\n"));
                        #ifdef DBG_RX_DROP_FRAME
-                       DBG_871X("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr error!\n", __FUNCTION__);
+                       DBG_871X("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr error!\n", __func__);
                        #endif
                        return retval;
                }
 
-               if ((padapter->bDriverStopped ==false)&&( padapter->bSurpriseRemoved==false))
+               if ((padapter->bDriverStopped ==false) && (padapter->bSurpriseRemoved ==false))
                {
-                       //indicate this recv_frame
-                       RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("@@@@ process_recv_indicatepkts- recv_func recv_indicatepkt\n" ));
+                       /* indicate this recv_frame */
+                       RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("@@@@ process_recv_indicatepkts- recv_func recv_indicatepkt\n"));
                        rtw_recv_indicatepkt(padapter, prframe);
 
 
                }
                else
                {
-                       RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("@@@@ process_recv_indicatepkts- recv_func free_indicatepkt\n" ));
+                       RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("@@@@ process_recv_indicatepkts- recv_func free_indicatepkt\n"));
 
                        RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_, ("recv_func:bDriverStopped(%d) OR bSurpriseRemoved(%d)", padapter->bDriverStopped, padapter->bSurpriseRemoved));
                        retval = _FAIL;
@@ -2827,21 +2672,19 @@ int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe)
 
 }
 
-static int recv_func_prehandle(_adapter *padapter, union recv_frame *rframe)
+static int recv_func_prehandle(struct adapter *padapter, union recv_frame *rframe)
 {
        int ret = _SUCCESS;
-       struct rx_pkt_attrib *pattrib = &rframe->u.hdr.attrib;
-       struct recv_priv *precvpriv = &padapter->recvpriv;
-       _queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue;
+       struct __queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue;
 
        DBG_COUNTER(padapter->rx_logs.core_rx_pre);
 
-       //check the frame crtl field and decache
+       /* check the frame crtl field and decache */
        ret = validate_recv_frame(padapter, rframe);
        if (ret != _SUCCESS)
        {
                RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("recv_func: validate_recv_frame fail! drop pkt\n"));
-               rtw_free_recvframe(rframe, pfree_recv_queue);//free this recv_frame
+               rtw_free_recvframe(rframe, pfree_recv_queue);/* free this recv_frame */
                goto exit;
        }
 
@@ -2849,21 +2692,20 @@ exit:
        return ret;
 }
 
-static int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
+static int recv_func_posthandle(struct adapter *padapter, union recv_frame *prframe)
 {
        int ret = _SUCCESS;
        union recv_frame *orig_prframe = prframe;
-       struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib;
        struct recv_priv *precvpriv = &padapter->recvpriv;
-       _queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue;
+       struct __queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue;
 
        DBG_COUNTER(padapter->rx_logs.core_rx_post);
 
        prframe = decryptor(padapter, prframe);
        if (prframe == NULL) {
-               RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("decryptor: drop pkt\n"));
+               RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("decryptor: drop pkt\n"));
                #ifdef DBG_RX_DROP_FRAME
-               DBG_871X("DBG_RX_DROP_FRAME %s decryptor: drop pkt\n", __FUNCTION__);
+               DBG_871X("DBG_RX_DROP_FRAME %s decryptor: drop pkt\n", __func__);
                #endif
                ret = _FAIL;
                DBG_COUNTER(padapter->rx_logs.core_rx_post_decrypt_err);
@@ -2871,20 +2713,20 @@ static int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
        }
 
        prframe = recvframe_chk_defrag(padapter, prframe);
-       if(prframe==NULL)       {
-               RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvframe_chk_defrag: drop pkt\n"));
+       if (prframe == NULL)    {
+               RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("recvframe_chk_defrag: drop pkt\n"));
                #ifdef DBG_RX_DROP_FRAME
-               DBG_871X("DBG_RX_DROP_FRAME %s recvframe_chk_defrag: drop pkt\n", __FUNCTION__);
+               DBG_871X("DBG_RX_DROP_FRAME %s recvframe_chk_defrag: drop pkt\n", __func__);
                #endif
                DBG_COUNTER(padapter->rx_logs.core_rx_post_defrag_err);
                goto _recv_data_drop;
        }
 
-       prframe=portctrl(padapter, prframe);
+       prframe =portctrl(padapter, prframe);
        if (prframe == NULL) {
-               RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("portctrl: drop pkt \n"));
+               RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("portctrl: drop pkt\n"));
                #ifdef DBG_RX_DROP_FRAME
-               DBG_871X("DBG_RX_DROP_FRAME %s portctrl: drop pkt\n", __FUNCTION__);
+               DBG_871X("DBG_RX_DROP_FRAME %s portctrl: drop pkt\n", __func__);
                #endif
                ret = _FAIL;
                DBG_COUNTER(padapter->rx_logs.core_rx_post_portctrl_err);
@@ -2896,11 +2738,11 @@ static int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
        ret = process_recv_indicatepkts(padapter, prframe);
        if (ret != _SUCCESS)
        {
-               RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recv_func: process_recv_indicatepkts fail! \n"));
+               RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("recv_func: process_recv_indicatepkts fail!\n"));
                #ifdef DBG_RX_DROP_FRAME
-               DBG_871X("DBG_RX_DROP_FRAME %s process_recv_indicatepkts fail!\n", __FUNCTION__);
+               DBG_871X("DBG_RX_DROP_FRAME %s process_recv_indicatepkts fail!\n", __func__);
                #endif
-               rtw_free_recvframe(orig_prframe, pfree_recv_queue);//free this recv_frame
+               rtw_free_recvframe(orig_prframe, pfree_recv_queue);/* free this recv_frame */
                DBG_COUNTER(padapter->rx_logs.core_rx_post_indicate_err);
                goto _recv_data_drop;
        }
@@ -2911,13 +2753,13 @@ _recv_data_drop:
 }
 
 
-int recv_func(_adapter *padapter, union recv_frame *rframe);
-int recv_func(_adapter *padapter, union recv_frame *rframe)
+int recv_func(struct adapter *padapter, union recv_frame *rframe);
+int recv_func(struct adapter *padapter, union recv_frame *rframe)
 {
        int ret;
        struct rx_pkt_attrib *prxattrib = &rframe->u.hdr.attrib;
        struct recv_priv *recvpriv = &padapter->recvpriv;
-       struct security_priv *psecuritypriv=&padapter->securitypriv;
+       struct security_priv *psecuritypriv =&padapter->securitypriv;
        struct mlme_priv *mlmepriv = &padapter->mlmepriv;
 
        /* check if need to handle uc_swdec_pending_queue*/
@@ -2926,7 +2768,7 @@ int recv_func(_adapter *padapter, union recv_frame *rframe)
                union recv_frame *pending_frame;
                int cnt = 0;
 
-               while((pending_frame=rtw_alloc_recvframe(&padapter->recvpriv.uc_swdec_pending_queue))) {
+               while ((pending_frame =rtw_alloc_recvframe(&padapter->recvpriv.uc_swdec_pending_queue))) {
                        cnt++;
                        DBG_COUNTER(padapter->rx_logs.core_rx_dequeue);
                        recv_func_posthandle(padapter, pending_frame);
@@ -2940,7 +2782,7 @@ int recv_func(_adapter *padapter, union recv_frame *rframe)
        DBG_COUNTER(padapter->rx_logs.core_rx);
        ret = recv_func_prehandle(padapter, rframe);
 
-       if(ret == _SUCCESS) {
+       if (ret == _SUCCESS) {
 
                /* check if need to enqueue into uc_swdec_pending_queue*/
                if (check_fwstate(mlmepriv, WIFI_STATION_STATE) &&
@@ -2951,7 +2793,7 @@ int recv_func(_adapter *padapter, union recv_frame *rframe)
                {
                        DBG_COUNTER(padapter->rx_logs.core_rx_enqueue);
                        rtw_enqueue_recvframe(rframe, &padapter->recvpriv.uc_swdec_pending_queue);
-                       //DBG_871X("%s: no key, enqueue uc_swdec_pending_queue\n", __func__);
+                       /* DBG_871X("%s: no key, enqueue uc_swdec_pending_queue\n", __func__); */
 
                        if (recvpriv->free_recvframe_cnt < NR_RECVFRAME/4) {
                                /* to prevent from recvframe starvation, get recvframe from uc_swdec_pending_queue to free_recvframe_cnt  */
@@ -2973,13 +2815,11 @@ exit:
 
 s32 rtw_recv_entry(union recv_frame *precvframe)
 {
-       _adapter *padapter;
+       struct adapter *padapter;
        struct recv_priv *precvpriv;
-       s32 ret=_SUCCESS;
+       s32 ret = _SUCCESS;
 
-_func_enter_;
-
-//     RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("+rtw_recv_entry\n"));
+/*     RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("+rtw_recv_entry\n")); */
 
        padapter = precvframe->u.hdr.adapter;
 
@@ -2988,28 +2828,24 @@ _func_enter_;
 
        if ((ret = recv_func(padapter, precvframe)) == _FAIL)
        {
-               RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("rtw_recv_entry: recv_func return fail!!!\n"));
+               RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("rtw_recv_entry: recv_func return fail!!!\n"));
                goto _recv_entry_drop;
        }
 
 
        precvpriv->rx_pkts++;
 
-_func_exit_;
-
        return ret;
 
 _recv_entry_drop:
 
-       //RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("_recv_entry_drop\n"));
-
-_func_exit_;
+       /* RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("_recv_entry_drop\n")); */
 
        return ret;
 }
 
-void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS){
-       _adapter *adapter = (_adapter *)FunctionContext;
+void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS) {
+       struct adapter *adapter = (struct adapter *)FunctionContext;
        struct recv_priv *recvpriv = &adapter->recvpriv;
 
        u32 tmp_s, tmp_q;
@@ -3017,25 +2853,25 @@ void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS){
        u8 avg_signal_qual = 0;
        u32 num_signal_strength = 0;
        u32 num_signal_qual = 0;
-       u8 _alpha = 5; // this value is based on converging_constant = 5000 and sampling_interval = 1000
+       u8 _alpha = 5; /*  this value is based on converging_constant = 5000 and sampling_interval = 1000 */
 
-       if(adapter->recvpriv.is_signal_dbg) {
-               //update the user specific value, signal_strength_dbg, to signal_strength, rssi
-               adapter->recvpriv.signal_strength= adapter->recvpriv.signal_strength_dbg;
-               adapter->recvpriv.rssi=(s8)translate_percentage_to_dbm((u8)adapter->recvpriv.signal_strength_dbg);
+       if (adapter->recvpriv.is_signal_dbg) {
+               /* update the user specific value, signal_strength_dbg, to signal_strength, rssi */
+               adapter->recvpriv.signal_strength = adapter->recvpriv.signal_strength_dbg;
+               adapter->recvpriv.rssi =(s8)translate_percentage_to_dbm((u8)adapter->recvpriv.signal_strength_dbg);
        } else {
 
-               if(recvpriv->signal_strength_data.update_req == 0) {// update_req is clear, means we got rx
+               if (recvpriv->signal_strength_data.update_req == 0) {/*  update_req is clear, means we got rx */
                        avg_signal_strength = recvpriv->signal_strength_data.avg_val;
                        num_signal_strength = recvpriv->signal_strength_data.total_num;
-                       // after avg_vals are accquired, we can re-stat the signal values
+                       /*  after avg_vals are accquired, we can re-stat the signal values */
                        recvpriv->signal_strength_data.update_req = 1;
                }
 
-               if(recvpriv->signal_qual_data.update_req == 0) {// update_req is clear, means we got rx
+               if (recvpriv->signal_qual_data.update_req == 0) {/*  update_req is clear, means we got rx */
                        avg_signal_qual = recvpriv->signal_qual_data.avg_val;
                        num_signal_qual = recvpriv->signal_qual_data.total_num;
-                       // after avg_vals are accquired, we can re-stat the signal values
+                       /*  after avg_vals are accquired, we can re-stat the signal values */
                        recvpriv->signal_qual_data.update_req = 1;
                }
 
@@ -3047,27 +2883,27 @@ void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS){
                        }
                }
 
-               if(check_fwstate(&adapter->mlmepriv, _FW_UNDER_SURVEY) == true
+               if (check_fwstate(&adapter->mlmepriv, _FW_UNDER_SURVEY) == true
                        || check_fwstate(&adapter->mlmepriv, _FW_LINKED) == false
                ) {
                        goto set_timer;
                }
 
-               //update value of signal_strength, rssi, signal_qual
+               /* update value of signal_strength, rssi, signal_qual */
                tmp_s = (avg_signal_strength+(_alpha-1)*recvpriv->signal_strength);
-               if(tmp_s %_alpha)
+               if (tmp_s %_alpha)
                        tmp_s = tmp_s/_alpha + 1;
                else
                        tmp_s = tmp_s/_alpha;
-               if(tmp_s>100)
+               if (tmp_s>100)
                        tmp_s = 100;
 
                tmp_q = (avg_signal_qual+(_alpha-1)*recvpriv->signal_qual);
-               if(tmp_q %_alpha)
+               if (tmp_q %_alpha)
                        tmp_q = tmp_q/_alpha + 1;
                else
                        tmp_q = tmp_q/_alpha;
-               if(tmp_q>100)
+               if (tmp_q>100)
                        tmp_q = 100;
 
                recvpriv->signal_strength = tmp_s;