OSDN Git Service

rtl8723au: Remove C99 comments from core/rtw_mlme.c
authorLarry Finger <Larry.Finger@lwfinger.net>
Sat, 30 Nov 2013 22:25:34 +0000 (16:25 -0600)
committerLarry Finger <Larry.Finger@lwfinger.net>
Sat, 30 Nov 2013 22:25:34 +0000 (16:25 -0600)
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
core/rtw_mlme.c

index dc06923..665142e 100644 (file)
@@ -19,7 +19,6 @@
  ******************************************************************************/
 #define _RTW_MLME_C_
 
-
 #include <drv_conf.h>
 #include <osdep_service.h>
 #include <drv_types.h>
@@ -38,9 +37,9 @@ extern u8 rtw_do_join(_adapter * padapter);
 #ifdef CONFIG_DISABLE_MCS13TO15
 extern unsigned char   MCS_rate_2R_MCS13TO15_OFF[16];
 extern unsigned char   MCS_rate_2R[16];
-#else //CONFIG_DISABLE_MCS13TO15
+#else /* CONFIG_DISABLE_MCS13TO15 */
 extern unsigned char   MCS_rate_2R[16];
-#endif //CONFIG_DISABLE_MCS13TO15
+#endif /* CONFIG_DISABLE_MCS13TO15 */
 extern unsigned char   MCS_rate_1R[16];
 
 sint   _rtw_init_mlme_priv (_adapter* padapter)
@@ -53,15 +52,15 @@ sint        _rtw_init_mlme_priv (_adapter* padapter)
 
 _func_enter_;
 
-       // We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc().
-       //_rtw_memset((u8 *)pmlmepriv, 0, sizeof(struct mlme_priv));
+       /*  We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). */
+       /* _rtw_memset((u8 *)pmlmepriv, 0, sizeof(struct mlme_priv)); */
 
        pmlmepriv->nic_hdl = (u8 *)padapter;
 
        pmlmepriv->pscanned = NULL;
        pmlmepriv->fw_state = 0;
        pmlmepriv->cur_network.network.InfrastructureMode = Ndis802_11AutoUnknown;
-       pmlmepriv->scan_mode=SCAN_ACTIVE;// 1: active, 0: pasive. Maybe someday we should rename this varable to "active_mode" (Jeff)
+       pmlmepriv->scan_mode=SCAN_ACTIVE;/*  1: active, 0: pasive. Maybe someday we should rename this varable to "active_mode" (Jeff) */
 
        _rtw_spinlock_init(&(pmlmepriv->lock));
        _rtw_init_queue(&(pmlmepriv->free_bss_pool));
@@ -90,13 +89,13 @@ _func_enter_;
                pnetwork++;
        }
 
-       //allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf
+       /* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */
 
        rtw_clear_scan_deny(padapter);
 
        #ifdef CONFIG_FTP_PROTECT
        pmlmepriv->ftp_lock_flag = 0;
-       #endif //CONFIG_FTP_PROTECT
+       #endif /* CONFIG_FTP_PROTECT */
 
        rtw_init_mlme_timer(padapter);
 
@@ -149,7 +148,6 @@ void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv)
        rtw_free_mlme_ie_data(&pmlmepriv->wfd_go_probe_resp_ie, &pmlmepriv->wfd_go_probe_resp_ie_len);
        rtw_free_mlme_ie_data(&pmlmepriv->wfd_assoc_req_ie, &pmlmepriv->wfd_assoc_req_ie_len);
 #endif
-
 }
 
 void _rtw_free_mlme_priv (struct mlme_priv *pmlmepriv)
@@ -218,7 +216,7 @@ _func_exit_;
        return pnetwork;
 }
 
-struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv )//(_queue *free_queue)
+struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv )/* _queue *free_queue) */
 {
        _irqL   irqL;
        struct  wlan_network    *pnetwork;
@@ -283,7 +281,7 @@ _func_enter_;
 
                delta_time = (curr_time -pnetwork->last_scanned)/10;
 
-               if(delta_time  < lifetime*1000000)// unit:usec
+               if(delta_time  < lifetime*1000000)/*  unit:usec */
                {
                        goto exit;
                }
@@ -294,7 +292,7 @@ _func_enter_;
 
                delta_time = (curr_time -pnetwork->last_scanned)/HZ;
 
-               if(delta_time < lifetime)// unit:sec
+               if(delta_time < lifetime)/*  unit:sec */
                {
                        goto exit;
                }
@@ -302,10 +300,10 @@ _func_enter_;
 #endif
 
 #ifdef PLATFORM_FREEBSD
-        //i think needs to check again
+        /* i think needs to check again */
                delta_time = (curr_time -pnetwork->last_scanned)/hz;
 
-               if(delta_time < lifetime)// unit:sec
+               if(delta_time < lifetime)/*  unit:sec */
                {
                        goto exit;
                }
@@ -321,15 +319,13 @@ _func_enter_;
 
        pmlmepriv->num_of_scanned --;
 
-
-       //DBG_8723A("_rtw_free_network:SSID=%s\n", pnetwork->network.Ssid.Ssid);
+       /* DBG_8723A("_rtw_free_network:SSID=%s\n", pnetwork->network.Ssid.Ssid); */
 
        _exit_critical_bh(&free_queue->lock, &irqL);
 
 exit:
 
 _func_exit_;
-
 }
 
 void _rtw_free_network_nolock(struct   mlme_priv *pmlmepriv, struct wlan_network *pnetwork)
@@ -345,7 +341,7 @@ _func_enter_;
        if (pnetwork->fixed == _TRUE)
                goto exit;
 
-       //_enter_critical(&free_queue->lock, &irqL);
+       /* _enter_critical(&free_queue->lock, &irqL); */
 
        rtw_list_delete(&(pnetwork->list));
 
@@ -353,15 +349,13 @@ _func_enter_;
 
        pmlmepriv->num_of_scanned --;
 
-       //_exit_critical(&free_queue->lock, &irqL);
+       /* _exit_critical(&free_queue->lock, &irqL); */
 
 exit:
 
 _func_exit_;
-
 }
 
-
 /*
        return the wlan_network with the matching addr
 
@@ -370,7 +364,7 @@ _func_exit_;
 struct wlan_network *_rtw_find_network(_queue *scanned_queue, u8 *addr)
 {
 
-       //_irqL irqL;
+       /* _irqL irqL; */
        _list   *phead, *plist;
        struct  wlan_network *pnetwork = NULL;
        u8 zero_addr[ETH_ALEN] = {0,0,0,0,0,0};
@@ -382,7 +376,7 @@ _func_enter_;
                goto exit;
        }
 
-       //_enter_critical_bh(&scanned_queue->lock, &irqL);
+       /* _enter_critical_bh(&scanned_queue->lock, &irqL); */
 
        phead = get_list_head(scanned_queue);
        plist = get_next(phead);
@@ -400,17 +394,15 @@ _func_enter_;
        if(plist == phead)
                pnetwork = NULL;
 
-       //_exit_critical_bh(&scanned_queue->lock, &irqL);
+       /* _exit_critical_bh(&scanned_queue->lock, &irqL); */
 
 exit:
 
 _func_exit_;
 
        return pnetwork;
-
 }
 
-
 void _rtw_free_network_queue(_adapter *padapter, u8 isfreeall)
 {
        _irqL irqL;
@@ -421,7 +413,6 @@ void _rtw_free_network_queue(_adapter *padapter, u8 isfreeall)
 
 _func_enter_;
 
-
        _enter_critical_bh(&scanned_queue->lock, &irqL);
 
        phead = get_list_head(scanned_queue);
@@ -441,12 +432,8 @@ _func_enter_;
        _exit_critical_bh(&scanned_queue->lock, &irqL);
 
 _func_exit_;
-
 }
 
-
-
-
 sint rtw_if_up(_adapter *padapter)     {
 
        sint res;
@@ -464,18 +451,17 @@ _func_exit_;
        return res;
 }
 
-
 void rtw_generate_random_ibss(u8* pibss)
 {
        u32     curtime = rtw_get_current_time();
 
 _func_enter_;
-       pibss[0] = 0x02;  //in ad-hoc mode bit1 must set to 1
+       pibss[0] = 0x02;  /* in ad-hoc mode bit1 must set to 1 */
        pibss[1] = 0x11;
        pibss[2] = 0x87;
-       pibss[3] = (u8)(curtime & 0xff) ;//p[0];
-       pibss[4] = (u8)((curtime>>8) & 0xff) ;//p[1];
-       pibss[5] = (u8)((curtime>>16) & 0xff) ;//p[2];
+       pibss[3] = (u8)(curtime & 0xff) ;/* p[0]; */
+       pibss[4] = (u8)((curtime>>8) & 0xff) ;/* p[1]; */
+       pibss[5] = (u8)((curtime>>16) & 0xff) ;/* p[2]; */
 _func_exit_;
        return;
 }
@@ -485,7 +471,6 @@ u8 *rtw_get_capability_from_ie(u8 *ie)
        return (ie + 8 + 2);
 }
 
-
 u16 rtw_get_capability(WLAN_BSSID_EX *bss)
 {
        u16     val;
@@ -507,12 +492,11 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie)
        return (ie + 8);
 }
 
-
-int    rtw_init_mlme_priv (_adapter *padapter)//(struct        mlme_priv *pmlmepriv)
+int    rtw_init_mlme_priv (_adapter *padapter)/* struct        mlme_priv *pmlmepriv) */
 {
        int     res;
 _func_enter_;
-       res = _rtw_init_mlme_priv(padapter);// (pmlmepriv);
+       res = _rtw_init_mlme_priv(padapter);/*  (pmlmepriv); */
 _func_exit_;
        return res;
 }
@@ -535,8 +519,7 @@ _func_exit_;
        return res;
 }
 
-
-#ifndef PLATFORM_FREEBSD //Baron
+#ifndef PLATFORM_FREEBSD /* Baron */
 static struct  wlan_network *rtw_dequeue_network(_queue *queue)
 {
        struct wlan_network *pnetwork;
@@ -545,10 +528,10 @@ _func_enter_;
 _func_exit_;
        return pnetwork;
 }
-#endif //PLATFORM_FREEBSD
+#endif /* PLATFORM_FREEBSD */
 
 struct wlan_network *rtw_alloc_network(struct  mlme_priv *pmlmepriv );
-struct wlan_network *rtw_alloc_network(struct  mlme_priv *pmlmepriv )//(_queue *free_queue)
+struct wlan_network *rtw_alloc_network(struct  mlme_priv *pmlmepriv )/* _queue *free_queue) */
 {
        struct  wlan_network    *pnetwork;
 _func_enter_;
@@ -558,7 +541,7 @@ _func_exit_;
 }
 
 void rtw_free_network(struct mlme_priv *pmlmepriv, struct      wlan_network *pnetwork, u8 is_freeall);
-void rtw_free_network(struct mlme_priv *pmlmepriv, struct      wlan_network *pnetwork, u8 is_freeall)//(struct wlan_network *pnetwork, _queue  *free_queue)
+void rtw_free_network(struct mlme_priv *pmlmepriv, struct      wlan_network *pnetwork, u8 is_freeall)/* struct wlan_network *pnetwork, _queue  *free_queue) */
 {
 _func_enter_;
        RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_network==> ssid = %s \n\n" , pnetwork->network.Ssid.Ssid));
@@ -570,12 +553,11 @@ void rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *p
 void rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork )
 {
 _func_enter_;
-       //RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_network==> ssid = %s \n\n" , pnetwork->network.Ssid.Ssid));
+       /* RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_network==> ssid = %s \n\n" , pnetwork->network.Ssid.Ssid)); */
        _rtw_free_network_nolock(pmlmepriv, pnetwork);
 _func_exit_;
 }
 
-
 void rtw_free_network_queue(_adapter* dev, u8 isfreeall)
 {
 _func_enter_;
@@ -616,14 +598,13 @@ int rtw_is_same_ibss(_adapter *adapter, struct wlan_network *pnetwork)
        }
 
        return ret;
-
 }
 
 inline int is_same_ess(WLAN_BSSID_EX *a, WLAN_BSSID_EX *b);
 inline int is_same_ess(WLAN_BSSID_EX *a, WLAN_BSSID_EX *b)
 {
-       //RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("(%s,%d)(%s,%d)\n",
-       //              a->Ssid.Ssid,a->Ssid.SsidLength,b->Ssid.Ssid,b->Ssid.SsidLength));
+       /* RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("(%s,%d)(%s,%d)\n", */
+       /*              a->Ssid.Ssid,a->Ssid.SsidLength,b->Ssid.Ssid,b->Ssid.SsidLength)); */
        return (a->Ssid.SsidLength == b->Ssid.SsidLength)
                &&  _rtw_memcmp(a->Ssid.Ssid, b->Ssid.Ssid, a->Ssid.SsidLength)==_TRUE;
 }
@@ -648,32 +629,28 @@ _func_enter_;
        }
 #endif
 
-
        _rtw_memcpy((u8 *)&s_cap, rtw_get_capability_from_ie(src->IEs), 2);
        _rtw_memcpy((u8 *)&d_cap, rtw_get_capability_from_ie(dst->IEs), 2);
 
-
        s_cap = le16_to_cpu(s_cap);
        d_cap = le16_to_cpu(d_cap);
 
 _func_exit_;
 
        return ((src->Ssid.SsidLength == dst->Ssid.SsidLength) &&
-               //      (src->Configuration.DSConfig == dst->Configuration.DSConfig) &&
+               /*      (src->Configuration.DSConfig == dst->Configuration.DSConfig) && */
                        ( (_rtw_memcmp(src->MacAddress, dst->MacAddress, ETH_ALEN)) == _TRUE) &&
                        ( (_rtw_memcmp(src->Ssid.Ssid, dst->Ssid.Ssid, src->Ssid.SsidLength)) == _TRUE) &&
                        ((s_cap & WLAN_CAPABILITY_IBSS) ==
                        (d_cap & WLAN_CAPABILITY_IBSS)) &&
                        ((s_cap & WLAN_CAPABILITY_BSS) ==
                        (d_cap & WLAN_CAPABILITY_BSS)));
-
 }
 
 struct wlan_network    * rtw_get_oldest_wlan_network(_queue *scanned_queue)
 {
        _list   *plist, *phead;
 
-
        struct  wlan_network    *pwlan = NULL;
        struct  wlan_network    *oldest = NULL;
 _func_enter_;
@@ -699,7 +676,6 @@ _func_enter_;
        }
 _func_exit_;
        return oldest;
-
 }
 
 void update_network(WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src,
@@ -720,7 +696,7 @@ void update_network(WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src,
 _func_enter_;
 
 #ifdef CONFIG_ANTENNA_DIVERSITY
-       rtw_hal_antdiv_rssi_compared(padapter, dst, src); //this will update src.Rssi, need consider again
+       rtw_hal_antdiv_rssi_compared(padapter, dst, src); /* this will update src.Rssi, need consider again */
 #endif
 
        #if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1
@@ -774,41 +750,6 @@ _func_enter_;
        }
        #endif
 
-#if 0 // old codes, may be useful one day...
-//     DBG_8723A("update_network: rssi=0x%lx dst->Rssi=%d ,dst->Rssi=0x%lx , src->Rssi=0x%lx",(dst->Rssi+src->Rssi)/2,dst->Rssi,dst->Rssi,src->Rssi);
-       if (check_fwstate(&padapter->mlmepriv, _FW_LINKED) && is_same_network(&(padapter->mlmepriv.cur_network.network), src))
-       {
-
-               //DBG_8723A("b:ssid=%s update_network: src->rssi=0x%d padapter->recvpriv.ui_rssi=%d\n",src->Ssid.Ssid,src->Rssi,padapter->recvpriv.signal);
-               if(padapter->recvpriv.signal_qual_data.total_num++ >= PHY_LINKQUALITY_SLID_WIN_MAX)
-               {
-                     padapter->recvpriv.signal_qual_data.total_num = PHY_LINKQUALITY_SLID_WIN_MAX;
-                     last_evm = padapter->recvpriv.signal_qual_data.elements[padapter->recvpriv.signal_qual_data.index];
-                     padapter->recvpriv.signal_qual_data.total_val -= last_evm;
-               }
-               padapter->recvpriv.signal_qual_data.total_val += query_rx_pwr_percentage(src->Rssi);
-
-               padapter->recvpriv.signal_qual_data.elements[padapter->recvpriv.signal_qual_data.index++] = query_rx_pwr_percentage(src->Rssi);
-                if(padapter->recvpriv.signal_qual_data.index >= PHY_LINKQUALITY_SLID_WIN_MAX)
-                       padapter->recvpriv.signal_qual_data.index = 0;
-
-               //DBG_8723A("Total SQ=%d  pattrib->signal_qual= %d\n", padapter->recvpriv.signal_qual_data.total_val, src->Rssi);
-
-               // <1> Showed on UI for user,in percentage.
-               tmpVal = padapter->recvpriv.signal_qual_data.total_val/padapter->recvpriv.signal_qual_data.total_num;
-                padapter->recvpriv.signal=(u8)tmpVal;//Link quality
-
-               src->Rssi= translate_percentage_to_dbm(padapter->recvpriv.signal) ;
-       }
-       else{
-//     DBG_8723A("ELSE:ssid=%s update_network: src->rssi=0x%d dst->rssi=%d\n",src->Ssid.Ssid,src->Rssi,dst->Rssi);
-               src->Rssi=(src->Rssi +dst->Rssi)/2;//dBM
-       }
-
-//     DBG_8723A("a:update_network: src->rssi=0x%d padapter->recvpriv.ui_rssi=%d\n",src->Rssi,padapter->recvpriv.signal);
-
-#endif
-
 _func_exit_;
 }
 
@@ -827,9 +768,9 @@ _func_enter_;
 
        if ( (check_fwstate(pmlmepriv, _FW_LINKED)== _TRUE) && (is_same_network(&(pmlmepriv->cur_network.network), pnetwork)))
        {
-               //RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,"Same Network\n");
+               /* RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,"Same Network\n"); */
 
-               //if(pmlmepriv->cur_network.network.IELength<= pnetwork->IELength)
+               /* if(pmlmepriv->cur_network.network.IELength<= pnetwork->IELength) */
                {
                        update_network(&(pmlmepriv->cur_network.network), pnetwork,adapter, _TRUE);
                        rtw_update_protection(adapter, (pmlmepriv->cur_network.network.IEs) + sizeof (NDIS_802_11_FIXED_IEs),
@@ -838,15 +779,12 @@ _func_enter_;
        }
 
 _func_exit_;
-
 }
 
-
 /*
 
 Caller must hold pmlmepriv->lock first.
 
-
 */
 void rtw_update_scanned_network(_adapter *adapter, WLAN_BSSID_EX *target)
 {
@@ -889,23 +827,21 @@ _func_enter_;
 
        }
 
-
        /* If we didn't find a match, then get a new network slot to initialize
         * with this beacon's information */
        if (rtw_end_of_queue_search(phead,plist)== _TRUE) {
 
                if (_rtw_queue_empty(&(pmlmepriv->free_bss_pool)) == _TRUE) {
                        /* If there are no more slots, expire the oldest */
-                       //list_del_init(&oldest->list);
+                       /* list_del_init(&oldest->list); */
                        pnetwork = oldest;
 
 #ifdef CONFIG_ANTENNA_DIVERSITY
-                       //target->PhyInfo.Optimum_antenna = pHalData->CurAntenna;//optimum_antenna=>For antenna diversity
                        rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(target->PhyInfo.Optimum_antenna));
 #endif
                        _rtw_memcpy(&(pnetwork->network), target,  get_WLAN_BSSID_EX_sz(target));
-                       //pnetwork->last_scanned = rtw_get_current_time();
-                       // variable initialize
+                       /* pnetwork->last_scanned = rtw_get_current_time(); */
+                       /*  variable initialize */
                        pnetwork->fixed = _FALSE;
                        pnetwork->last_scanned = rtw_get_current_time();
 
@@ -920,7 +856,7 @@ _func_enter_;
                else {
                        /* Otherwise just pull from the free list */
 
-                       pnetwork = rtw_alloc_network(pmlmepriv); // will update scan_time
+                       pnetwork = rtw_alloc_network(pmlmepriv); /*  will update scan_time */
 
                        if(pnetwork==NULL){
                                RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n\n\nsomething wrong here\n\n\n"));
@@ -930,7 +866,7 @@ _func_enter_;
                        bssid_ex_sz = get_WLAN_BSSID_EX_sz(target);
                        target->Length = bssid_ex_sz;
 #ifdef CONFIG_ANTENNA_DIVERSITY
-                       //target->PhyInfo.Optimum_antenna = pHalData->CurAntenna;
+                       /* target->PhyInfo.Optimum_antenna = pHalData->CurAntenna; */
                        rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(target->PhyInfo.Optimum_antenna));
 #endif
                        _rtw_memcpy(&(pnetwork->network), target, bssid_ex_sz );
@@ -954,7 +890,7 @@ _func_enter_;
 
                pnetwork->last_scanned = rtw_get_current_time();
 
-               //target.Reserved[0]==1, means that scaned network is a bcn frame.
+               /* target.Reserved[0]==1, means that scaned network is a bcn frame. */
                if((pnetwork->network.IELength>target->IELength) && (target->Reserved[0]==1))
                        update_ie = _FALSE;
 
@@ -972,11 +908,11 @@ void rtw_add_network(_adapter *adapter, WLAN_BSSID_EX *pnetwork)
 {
        _irqL irqL;
        struct  mlme_priv       *pmlmepriv = &(((_adapter *)adapter)->mlmepriv);
-       //_queue        *queue  = &(pmlmepriv->scanned_queue);
+       /* _queue       *queue  = &(pmlmepriv->scanned_queue); */
 
 _func_enter_;
 
-       //_enter_critical_bh(&queue->lock, &irqL);
+       /* _enter_critical_bh(&queue->lock, &irqL); */
 
        #if defined(CONFIG_P2P) && defined(CONFIG_P2P_REMOVE_GROUP_INFO)
        rtw_WLAN_BSSID_EX_remove_p2p_attr(pnetwork, P2P_ATTR_GROUP_INFO);
@@ -986,17 +922,17 @@ _func_enter_;
 
        rtw_update_scanned_network(adapter, pnetwork);
 
-       //_exit_critical_bh(&queue->lock, &irqL);
+       /* _exit_critical_bh(&queue->lock, &irqL); */
 
 _func_exit_;
 }
 
-//select the desired network based on the capability of the (i)bss.
-// check items: (1) security
-//                        (2) network_type
-//                        (3) WMM
-//                        (4) HT
-//                     (5) others
+/* select the desired network based on the capability of the (i)bss. */
+/*  check items: (1) security */
+/*                        (2) network_type */
+/*                        (3) WMM */
+/*                        (4) HT */
+/*                      (5) others */
 int rtw_is_desired_network(_adapter *adapter, struct wlan_network *pnetwork);
 int rtw_is_desired_network(_adapter *adapter, struct wlan_network *pnetwork)
 {
@@ -1005,7 +941,7 @@ int rtw_is_desired_network(_adapter *adapter, struct wlan_network *pnetwork)
        u32 desired_encmode;
        u32 privacy;
 
-       //u8 wps_ie[512];
+       /* u8 wps_ie[512]; */
        uint wps_ielen;
 
        int bselected = _TRUE;
@@ -1024,13 +960,12 @@ int rtw_is_desired_network(_adapter *adapter, struct wlan_network *pnetwork)
                        return _FALSE;
                }
        }
-       if (adapter->registrypriv.wifi_spec == 1) //for  correct flow of 8021X  to do....
+       if (adapter->registrypriv.wifi_spec == 1) /* for  correct flow of 8021X  to do.... */
        {
                if ((desired_encmode == Ndis802_11EncryptionDisabled) && (privacy != 0))
                    bselected = _FALSE;
        }
 
-
        if ((desired_encmode != Ndis802_11EncryptionDisabled) && (privacy == 0)) {
                DBG_8723A("desired_encmode: %d, privacy: %d\n", desired_encmode, privacy);
                bselected = _FALSE;
@@ -1042,7 +977,6 @@ int rtw_is_desired_network(_adapter *adapter, struct wlan_network *pnetwork)
                        bselected = _FALSE;
        }
 
-
        return bselected;
 }
 
@@ -1056,7 +990,6 @@ _func_exit_;
        return;
 }
 
-
 void rtw_survey_event_callback(_adapter        *adapter, u8 *pbuf)
 {
        _irqL  irqL;
@@ -1071,7 +1004,7 @@ _func_enter_;
        RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("rtw_survey_event_callback, ssid=%s\n",  pnetwork->Ssid.Ssid));
 
 #ifdef CONFIG_RTL8712
-        //endian_convert
+        /* endian_convert */
        pnetwork->Length = le32_to_cpu(pnetwork->Length);
        pnetwork->Ssid.SsidLength = le32_to_cpu(pnetwork->Ssid.SsidLength);
        pnetwork->Privacy =le32_to_cpu( pnetwork->Privacy);
@@ -1096,13 +1029,12 @@ _func_enter_;
                return;
        }
 
-
        _enter_critical_bh(&pmlmepriv->lock, &irqL);
 
-       // update IBSS_network 's timestamp
+       /*  update IBSS_network 's timestamp */
        if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) == _TRUE)
        {
-               //RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,"rtw_survey_event_callback : WIFI_ADHOC_MASTER_STATE \n\n");
+               /* RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,"rtw_survey_event_callback : WIFI_ADHOC_MASTER_STATE \n\n"); */
                if(_rtw_memcmp(&(pmlmepriv->cur_network.network.MacAddress), pnetwork->MacAddress, ETH_ALEN))
                {
                        struct wlan_network* ibss_wlan = NULL;
@@ -1121,7 +1053,7 @@ _func_enter_;
                }
        }
 
-       // lock pmlmepriv->lock when you accessing network_q
+       /*  lock pmlmepriv->lock when you accessing network_q */
        if ((check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) == _FALSE)
        {
                if( pnetwork->Ssid.Ssid[0] == 0 )
@@ -1140,8 +1072,6 @@ _func_exit_;
        return;
 }
 
-
-
 void rtw_surveydone_event_callback(_adapter    *adapter, u8 *pbuf)
 {
        _irqL  irqL;
@@ -1201,7 +1131,6 @@ _func_enter_;
                                        WLAN_BSSID_EX    *pdev_network = &(adapter->registrypriv.dev_network);
                                        u8 *pibss = adapter->registrypriv.dev_network.MacAddress;
 
-                                       //pmlmepriv->fw_state ^= _FW_UNDER_SURVEY;//because don't set assoc_timer
                                        _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY);
 
                                        RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("switching to adhoc master\n"));
@@ -1232,7 +1161,7 @@ _func_enter_;
                        {
                             _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT);
                        }
-                       else if(s_ret == 2)//there is no need to wait for join
+                       else if(s_ret == 2)/* there is no need to wait for join */
                        {
                                _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
                                rtw_indicate_connect(adapter);
@@ -1253,7 +1182,7 @@ _func_enter_;
                                                        intel_widi_wk_cmd(adapter, INTEL_WIDI_LISTEN_WK, NULL);
                                                        DBG_8723A("change to widi listen\n");
                                                }
-#endif // CONFIG_INTEL_WIDI
+#endif /*  CONFIG_INTEL_WIDI */
                                                rtw_free_assoc_resources(adapter, 1);
                                                rtw_indicate_disconnect(adapter);
                                        } else {
@@ -1267,7 +1196,7 @@ _func_enter_;
        }
 
        indicate_wx_scan_complete_event(adapter);
-       //DBG_8723A("scan complete in %dms\n",rtw_get_passing_time_ms(pmlmepriv->scan_start_time));
+       /* DBG_8723A("scan complete in %dms\n",rtw_get_passing_time_ms(pmlmepriv->scan_start_time)); */
 
        _exit_critical_bh(&pmlmepriv->lock, &irqL);
 
@@ -1275,7 +1204,7 @@ _func_enter_;
        if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) {
                p2p_ps_wk_cmd(adapter, P2P_PS_SCAN_DONE, 0);
        }
-#endif // CONFIG_P2P_PS
+#endif /*  CONFIG_P2P_PS */
 
        rtw_os_xmit_schedule(adapter);
 #ifdef CONFIG_CONCURRENT_MODE
@@ -1300,20 +1229,17 @@ _func_enter_;
 
 #ifdef CONFIG_IOCTL_CFG80211
        rtw_cfg80211_surveydone_event_callback(adapter);
-#endif //CONFIG_IOCTL_CFG80211
+#endif /* CONFIG_IOCTL_CFG80211 */
 
 _func_exit_;
-
 }
 
 void rtw_dummy_event_callback(_adapter *adapter , u8 *pbuf)
 {
-
 }
 
 void rtw_fwdbg_event_callback(_adapter *adapter , u8 *pbuf)
 {
-
 }
 
 static void free_scanqueue(struct      mlme_priv *pmlmepriv)
@@ -1360,7 +1286,7 @@ void rtw_free_assoc_resources(_adapter *adapter, int lock_scanned_queue)
 
 #ifdef CONFIG_TDLS
        struct tdls_info *ptdlsinfo = &adapter->tdlsinfo;
-#endif //CONFIG_TDLS
+#endif /* CONFIG_TDLS */
 _func_enter_;
 
        RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+rtw_free_assoc_resources\n"));
@@ -1382,7 +1308,7 @@ _func_enter_;
                        _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
                }
                else
-#endif //CONFIG_TDLS
+#endif /* CONFIG_TDLS */
                {
                        _enter_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
                        rtw_free_stainfo(adapter,  psta);
@@ -1419,7 +1345,6 @@ _func_enter_;
                RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("rtw_free_assoc_resources : pwlan== NULL \n\n"));
        }
 
-
        if((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) && (adapter->stapriv.asoc_sta_count== 1))
                /*||check_fwstate(pmlmepriv, WIFI_STATION_STATE)*/)
        {
@@ -1432,7 +1357,6 @@ _func_enter_;
        pmlmepriv->key_mask = 0;
 
 _func_exit_;
-
 }
 
 /*
@@ -1460,7 +1384,6 @@ _func_enter_;
 
                rtw_led_control(padapter, LED_CTL_LINK);
 
-
 #ifdef CONFIG_DRVEXT_MODULE
                if(padapter->drvextpriv.enable_wpa)
                {
@@ -1482,17 +1405,15 @@ _func_enter_;
                intel_widi_wk_cmd(padapter, INTEL_WIDI_LISTEN_WK, NULL);
                DBG_8723A("change to widi listen\n");
        }
-#endif // CONFIG_INTEL_WIDI
+#endif /*  CONFIG_INTEL_WIDI */
 
        rtw_set_scan_deny(padapter, 3000);
 
        RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("-rtw_indicate_connect: fw_state=0x%08x\n", get_fwstate(pmlmepriv)));
 
 _func_exit_;
-
 }
 
-
 /*
 *rtw_indicate_disconnect: the caller has to lock pmlmepriv->lock
 */
@@ -1511,7 +1432,7 @@ _func_enter_;
 
        _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING|WIFI_UNDER_WPS);
 
-        //DBG_8723A("clear wps when %s\n", __func__);
+        /* DBG_8723A("clear wps when %s\n", __func__); */
 
        if(rtw_to_roaming(padapter) > 0)
                _clr_fwstate_(pmlmepriv, _FW_LINKED);
@@ -1535,7 +1456,7 @@ _func_enter_;
        {
                rtw_os_indicate_disconnect(padapter);
 
-               //set ips_deny_time to avoid enter IPS before LPS leave
+               /* set ips_deny_time to avoid enter IPS before LPS leave */
                padapter->pwrctrlpriv.ips_deny_time = rtw_get_current_time() + rtw_ms_to_systime(3000);
 
              _clr_fwstate_(pmlmepriv, _FW_LINKED);
@@ -1548,12 +1469,12 @@ _func_enter_;
 
 #ifdef CONFIG_P2P_PS
        p2p_ps_wk_cmd(padapter, P2P_PS_DISABLE, 1);
-#endif // CONFIG_P2P_PS
+#endif /*  CONFIG_P2P_PS */
 
 #ifdef CONFIG_LPS
 #ifdef CONFIG_WOWLAN
        if(padapter->pwrctrlpriv.wowlan_mode==_FALSE)
-#endif //CONFIG_WOWLAN
+#endif /* CONFIG_WOWLAN */
        rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_DISCONNECT, 1);
 #endif
 
@@ -1588,7 +1509,7 @@ void rtw_scan_abort(_adapter *adapter)
                if (!adapter->bDriverStopped && !adapter->bSurpriseRemoved)
                        DBG_8723A(FUNC_NDEV_FMT"waiting for scan_abort time out!\n", FUNC_NDEV_ARG(adapter->pnetdev));
                #ifdef CONFIG_PLATFORM_MSTAR_TITANIA12
-               //_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY);
+               /* _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); */
                set_survey_timer(pmlmeext, 0);
                _set_timer(&pmlmepriv->scan_to_timer, 50);
                #endif
@@ -1609,7 +1530,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl
                psta = rtw_alloc_stainfo(pstapriv, pnetwork->network.MacAddress);
        }
 
-       if(psta) //update ptarget_sta
+       if(psta) /* update ptarget_sta */
        {
                DBG_8723A("%s\n", __FUNCTION__);
 
@@ -1624,10 +1545,10 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl
                        psta->mac_id=0;
 #endif
 
-               //sta mode
+               /* sta mode */
                rtw_hal_set_odm_var(padapter,HAL_ODM_STA_INFO,psta,_TRUE);
 
-               //security related
+               /* security related */
                if(padapter->securitypriv.dot11AuthAlgrthm== dot11AuthAlgrthm_8021X)
                {
                        padapter->securitypriv.binstallGrpkey=_FALSE;
@@ -1646,22 +1567,21 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl
                        _rtw_memset((u8 *)&psta->dot11rxpn, 0, sizeof (union pn48));
                }
 
-               //      Commented by Albert 2012/07/21
-               //      When doing the WPS, the wps_ie_len won't equal to 0
-               //      And the Wi-Fi driver shouldn't allow the data packet to be tramsmitted.
+               /*      Commented by Albert 2012/07/21 */
+               /*      When doing the WPS, the wps_ie_len won't equal to 0 */
+               /*      And the Wi-Fi driver shouldn't allow the data packet to be tramsmitted. */
                if ( padapter->securitypriv.wps_ie_len != 0 )
                {
                        psta->ieee8021x_blocked=_TRUE;
                        padapter->securitypriv.wps_ie_len = 0;
                }
 
-
-               //for A-MPDU Rx reordering buffer control for bmc_sta & sta_info
-               //if A-MPDU Rx is enabled, reseting  rx_ordering_ctrl wstart_b(indicate_seq) to default value=0xffff
-               //todo: check if AP can send A-MPDU packets
+               /* for A-MPDU Rx reordering buffer control for bmc_sta & sta_info */
+               /* if A-MPDU Rx is enabled, reseting  rx_ordering_ctrl wstart_b(indicate_seq) to default value=0xffff */
+               /* todo: check if AP can send A-MPDU packets */
                for(i=0; i < 16 ; i++)
                {
-                       //preorder_ctrl = &precvpriv->recvreorder_ctrl[i];
+                       /* preorder_ctrl = &precvpriv->recvreorder_ctrl[i]; */
                        preorder_ctrl = &psta->recvreorder_ctrl[i];
                        preorder_ctrl->enable = _FALSE;
                        preorder_ctrl->indicate_seq = 0xffff;
@@ -1670,16 +1590,15 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl
                                preorder_ctrl->indicate_seq);
                        #endif
                        preorder_ctrl->wend_b= 0xffff;
-                       preorder_ctrl->wsize_b = 64;//max_ampdu_sz;//ex. 32(kbytes) -> wsize_b=32
+                       preorder_ctrl->wsize_b = 64;/* max_ampdu_sz; ex. 32(kbytes) -> wsize_b=32 */
                }
 
-
                bmc_sta = rtw_get_bcmc_stainfo(padapter);
                if(bmc_sta)
                {
                        for(i=0; i < 16 ; i++)
                        {
-                               //preorder_ctrl = &precvpriv->recvreorder_ctrl[i];
+                               /* preorder_ctrl = &precvpriv->recvreorder_ctrl[i]; */
                                preorder_ctrl = &bmc_sta->recvreorder_ctrl[i];
                                preorder_ctrl->enable = _FALSE;
                                preorder_ctrl->indicate_seq = 0xffff;
@@ -1688,22 +1607,20 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl
                                        preorder_ctrl->indicate_seq);
                                #endif
                                preorder_ctrl->wend_b= 0xffff;
-                               preorder_ctrl->wsize_b = 64;//max_ampdu_sz;//ex. 32(kbytes) -> wsize_b=32
+                               preorder_ctrl->wsize_b = 64;/* max_ampdu_sz; ex. 32(kbytes) -> wsize_b=32 */
                        }
                }
 
-
-               //misc.
+               /* misc. */
                update_sta_info(padapter, psta);
 
        }
 
        return psta;
-
 }
 
-//pnetwork : returns from rtw_joinbss_event_callback
-//ptarget_wlan: found from scanned_queue
+/* pnetwork : returns from rtw_joinbss_event_callback */
+/* ptarget_wlan: found from scanned_queue */
 static void rtw_joinbss_update_network(_adapter *padapter, struct wlan_network *ptarget_wlan, struct wlan_network  *pnetwork)
 {
        struct mlme_priv        *pmlmepriv = &(padapter->mlmepriv);
@@ -1714,22 +1631,20 @@ static void rtw_joinbss_update_network(_adapter *padapter, struct wlan_network *
        RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("\nfw_state:%x, BSSID:"MAC_FMT"\n"
                ,get_fwstate(pmlmepriv), MAC_ARG(pnetwork->network.MacAddress)));
 
-
-       // why not use ptarget_wlan??
+       /*  why not use ptarget_wlan?? */
        _rtw_memcpy(&cur_network->network, &pnetwork->network, pnetwork->network.Length);
-       // some IEs in pnetwork is wrong, so we should use ptarget_wlan IEs
+       /*  some IEs in pnetwork is wrong, so we should use ptarget_wlan IEs */
        cur_network->network.IELength = ptarget_wlan->network.IELength;
        _rtw_memcpy(&cur_network->network.IEs[0], &ptarget_wlan->network.IEs[0], MAX_IE_SZ);
 
        cur_network->aid = pnetwork->join_res;
 
-
 #ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS
        rtw_set_signal_stat_timer(&padapter->recvpriv);
 #endif
        padapter->recvpriv.signal_strength = ptarget_wlan->network.PhyInfo.SignalStrength;
        padapter->recvpriv.signal_qual = ptarget_wlan->network.PhyInfo.SignalQuality;
-       //the ptarget_wlan->network.Rssi is raw data, we use ptarget_wlan->network.PhyInfo.SignalStrength instead (has scaled)
+       /* the ptarget_wlan->network.Rssi is raw data, we use ptarget_wlan->network.PhyInfo.SignalStrength instead (has scaled) */
        padapter->recvpriv.rssi = translate_percentage_to_dbm(ptarget_wlan->network.PhyInfo.SignalStrength);
        #if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1
                DBG_8723A("%s signal_strength:%3u, rssi:%3d, signal_qual:%3u"
@@ -1744,7 +1659,7 @@ static void rtw_joinbss_update_network(_adapter *padapter, struct wlan_network *
        rtw_set_signal_stat_timer(&padapter->recvpriv);
 #endif
 
-       //update fw_state //will clr _FW_UNDER_LINKING here indirectly
+       /* update fw_state will clr _FW_UNDER_LINKING here indirectly */
        switch(pnetwork->network.InfrastructureMode)
        {
                case Ndis802_11Infrastructure:
@@ -1770,18 +1685,16 @@ static void rtw_joinbss_update_network(_adapter *padapter, struct wlan_network *
 #ifdef CONFIG_80211N_HT
        rtw_update_ht_cap(padapter, cur_network->network.IEs, cur_network->network.IELength);
 #endif
-
-
 }
 
-//Notes: the fucntion could be > passive_level (the same context as Rx tasklet)
-//pnetwork : returns from rtw_joinbss_event_callback
-//ptarget_wlan: found from scanned_queue
-//if join_res > 0, for (fw_state==WIFI_STATION_STATE), we check if  "ptarget_sta" & "ptarget_wlan" exist.
-//if join_res > 0, for (fw_state==WIFI_ADHOC_STATE), we only check if "ptarget_wlan" exist.
-//if join_res > 0, update "cur_network->network" from "pnetwork->network" if (ptarget_wlan !=NULL).
-//
-//#define REJOIN
+/* Notes: the fucntion could be > passive_level (the same context as Rx tasklet) */
+/* pnetwork : returns from rtw_joinbss_event_callback */
+/* ptarget_wlan: found from scanned_queue */
+/* if join_res > 0, for (fw_state==WIFI_STATION_STATE), we check if  "ptarget_sta" & "ptarget_wlan" exist. */
+/* if join_res > 0, for (fw_state==WIFI_ADHOC_STATE), we only check if "ptarget_wlan" exist. */
+/* if join_res > 0, update "cur_network->network" from "pnetwork->network" if (ptarget_wlan !=NULL). */
+/*  */
+/* define REJOIN */
 void rtw_joinbss_event_prehandle(_adapter *adapter, u8 *pbuf)
 {
        _irqL irqL,irqL2;
@@ -1798,7 +1711,7 @@ void rtw_joinbss_event_prehandle(_adapter *adapter, u8 *pbuf)
 _func_enter_;
 
 #ifdef CONFIG_RTL8712
-       //endian_convert
+       /* endian_convert */
        pnetwork->join_res = le32_to_cpu(pnetwork->join_res);
        pnetwork->network_type = le32_to_cpu(pnetwork->network_type);
        pnetwork->network.Length = le32_to_cpu(pnetwork->network.Length);
@@ -1822,7 +1735,6 @@ _func_enter_;
 
        rtw_get_encrypt_decrypt_from_registrypriv(adapter);
 
-
        if (pmlmepriv->assoc_ssid.SsidLength == 0)
        {
                RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("@@@@@   joinbss event call back  for Any SSid\n"));
@@ -1851,7 +1763,7 @@ _func_enter_;
                retry = 0;
                if (check_fwstate(pmlmepriv,_FW_UNDER_LINKING) )
                {
-                       //s1. find ptarget_wlan
+                       /* s1. find ptarget_wlan */
                        if(check_fwstate(pmlmepriv, _FW_LINKED) )
                        {
                                if(the_same_macaddr == _TRUE)
@@ -1885,7 +1797,7 @@ _func_enter_;
                                }
                        }
 
-                       //s2. update cur_network
+                       /* s2. update cur_network */
                        if(ptarget_wlan)
                        {
                                rtw_joinbss_update_network(adapter, ptarget_wlan, pnetwork);
@@ -1897,8 +1809,7 @@ _func_enter_;
                                goto ignore_joinbss_callback;
                        }
 
-
-                       //s3. find ptarget_sta & update ptarget_sta after update cur_network only for station mode
+                       /* s3. find ptarget_sta & update ptarget_sta after update cur_network only for station mode */
                        if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE)
                        {
                                ptarget_sta = rtw_joinbss_update_stainfo(adapter, pnetwork);
@@ -1910,19 +1821,18 @@ _func_enter_;
                                }
                        }
 
-                       //s4. indicate connect
+                       /* s4. indicate connect */
                                if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE)
                                {
                                        rtw_indicate_connect(adapter);
                                }
                                else
                                {
-                                       //adhoc mode will rtw_indicate_connect when rtw_stassoc_event_callback
+                                       /* adhoc mode will rtw_indicate_connect when rtw_stassoc_event_callback */
                                        RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("adhoc mode, fw_state:%x", get_fwstate(pmlmepriv)));
                                }
 
-
-                       //s5. Cancle assoc_timer
+                       /* s5. Cancle assoc_timer */
                        _cancel_timer(&pmlmepriv->assoc_timer, &timer_cancelled);
 
                        RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("Cancle assoc_timer \n"));
@@ -1943,7 +1853,7 @@ _func_enter_;
                rtw_reset_securitypriv(adapter);
                _set_timer(&pmlmepriv->assoc_timer, 1);
 
-               //rtw_free_assoc_resources(adapter, 1);
+               /* rtw_free_assoc_resources(adapter, 1); */
 
                if((check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) == _TRUE)
                {
@@ -1952,7 +1862,7 @@ _func_enter_;
                }
 
        }
-       else //if join_res < 0 (join fails), then try again
+       else /* if join_res < 0 (join fails), then try again */
        {
 
                #ifdef REJOIN
@@ -1964,11 +1874,11 @@ _func_enter_;
 
                 if(res == _SUCCESS)
                {
-                       //extend time of assoc_timer
+                       /* extend time of assoc_timer */
                        _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT);
                        retry++;
                }
-               else if(res == 2)//there is no need to wait for join
+               else if(res == 2)/* there is no need to wait for join */
                {
                        _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
                        rtw_indicate_connect(adapter);
@@ -1979,7 +1889,7 @@ _func_enter_;
                #endif
 
                        _set_timer(&pmlmepriv->assoc_timer, 1);
-                       //rtw_free_assoc_resources(adapter, 1);
+                       /* rtw_free_assoc_resources(adapter, 1); */
                        _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
 
                #ifdef REJOIN
@@ -2018,7 +1928,7 @@ _func_exit_;
 u8 search_max_mac_id(_adapter *padapter)
 {
        u8 mac_id, aid;
-#if (RATE_ADAPTIVE_SUPPORT==1) //for 88E RA
+#if (RATE_ADAPTIVE_SUPPORT==1) /* for 88E RA */
        struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
        struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
        struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
@@ -2043,7 +1953,7 @@ u8 search_max_mac_id(_adapter *padapter)
        }
        else
 #endif
-       {//adhoc  id =  31~2
+       {/* adhoc  id =  31~2 */
                for (mac_id = (NUM_STA-1); mac_id >= IBSS_START_MAC_ID ; mac_id--)
                {
                        if (pmlmeinfo->FW_sta_info[mac_id].status == 1)
@@ -2054,23 +1964,22 @@ u8 search_max_mac_id(_adapter *padapter)
        }
 #endif
        return mac_id;
-
 }
 
-//FOR AP ,AD-HOC mode
+/* FOR AP ,AD-HOC mode */
 void rtw_stassoc_hw_rpt(_adapter *adapter,struct sta_info *psta)
 {
        u16 media_status;
 
        if(psta==NULL)  return;
 
-       #if (RATE_ADAPTIVE_SUPPORT==1)  //for 88E RA
+       #if (RATE_ADAPTIVE_SUPPORT==1)  /* for 88E RA */
        {
                u8 macid = search_max_mac_id(adapter);
                rtw_hal_set_hwreg(adapter,HW_VAR_TX_RPT_MAX_MACID, (u8*)&macid);
        }
        #endif
-       media_status = (psta->mac_id<<8)|1; //  MACID|OPMODE:1 connect
+       media_status = (psta->mac_id<<8)|1; /*   MACID|OPMODE:1 connect */
        rtw_hal_set_hwreg(adapter,HW_VAR_H2C_MEDIA_STATUS_RPT,(u8 *)&media_status);
 }
 
@@ -2123,11 +2032,11 @@ _func_enter_;
 
                                _rtw_mfree(passoc_req, assoc_req_len);
                        }
-                       #endif //(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)) || defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER)
-#endif //CONFIG_IOCTL_CFG80211
+                       #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)) || defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER) */
+#endif /* CONFIG_IOCTL_CFG80211 */
 
-                       //bss_cap_update_on_sta_join(adapter, psta);
-                       //sta_info_update(adapter, psta);
+                       /* bss_cap_update_on_sta_join(adapter, psta); */
+                       /* sta_info_update(adapter, psta); */
                        ap_sta_info_defer_update(adapter, psta);
 
                        rtw_stassoc_hw_rpt(adapter,psta);
@@ -2137,15 +2046,15 @@ _func_enter_;
                goto exit;
        }
 #endif
-       //for AD-HOC mode
+       /* for AD-HOC mode */
        psta = rtw_get_stainfo(&adapter->stapriv, pstassoc->macaddr);
        if( psta != NULL)
        {
-               //the sta have been in sta_info_queue => do nothing
+               /* the sta have been in sta_info_queue => do nothing */
 
                RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("Error: rtw_stassoc_event_callback: sta has been in sta_hash_queue \n"));
 
-               goto exit; //(between drv has received this event before and  fw have not yet to set key to CAM_ENTRY)
+               goto exit; /* between drv has received this event before and  fw have not yet to set key to CAM_ENTRY) */
        }
 
        psta = rtw_alloc_stainfo(&adapter->stapriv, pstassoc->macaddr);
@@ -2154,12 +2063,12 @@ _func_enter_;
                goto exit;
        }
 
-       //to do : init sta_info variable
+       /* to do : init sta_info variable */
        psta->qos_option = 0;
        psta->mac_id = (uint)pstassoc->cam_id;
-       //psta->aid = (uint)pstassoc->cam_id;
+       /* psta->aid = (uint)pstassoc->cam_id; */
        DBG_8723A("%s\n",__FUNCTION__);
-       //for ad-hoc mode
+       /* for ad-hoc mode */
        rtw_hal_set_odm_var(adapter,HAL_ODM_STA_INFO,psta,_TRUE);
 
        rtw_stassoc_hw_rpt(adapter,psta);
@@ -2167,7 +2076,6 @@ _func_enter_;
        if(adapter->securitypriv.dot11AuthAlgrthm==dot11AuthAlgrthm_8021X)
                psta->dot118021XPrivacy = adapter->securitypriv.dot11PrivacyAlgrthm;
 
-
        psta->ieee8021x_blocked = _FALSE;
 
        _enter_critical_bh(&pmlmepriv->lock, &irqL);
@@ -2181,25 +2089,23 @@ _func_enter_;
                        ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, cur_network->network.MacAddress);
                        if(ptarget_wlan)        ptarget_wlan->fixed = _TRUE;
                        _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
-                       // a sta + bc/mc_stainfo (not Ibss_stainfo)
+                       /*  a sta + bc/mc_stainfo (not Ibss_stainfo) */
                        rtw_indicate_connect(adapter);
                }
        }
 
        _exit_critical_bh(&pmlmepriv->lock, &irqL);
 
-
        mlmeext_sta_add_event_callback(adapter, psta);
 
 #ifdef CONFIG_RTL8711
-       //submit SetStaKey_cmd to tell fw, fw will allocate an CAM entry for this sta
+       /* submit SetStaKey_cmd to tell fw, fw will allocate an CAM entry for this sta */
        rtw_setstakey_cmd(adapter, (unsigned char*)psta, _FALSE);
 #endif
 
 exit:
 
 _func_exit_;
-
 }
 
 void rtw_stadel_event_callback(_adapter *adapter, u8 *pbuf)
@@ -2227,8 +2133,8 @@ _func_enter_;
 
        if(mac_id>=0){
                u16 media_status;
-               media_status = (mac_id<<8)|0; //  MACID|OPMODE:0 means disconnect
-               //for STA,AP,ADHOC mode, report disconnect stauts to FW
+               media_status = (mac_id<<8)|0; /*   MACID|OPMODE:0 means disconnect */
+               /* for STA,AP,ADHOC mode, report disconnect stauts to FW */
                rtw_hal_set_hwreg(adapter, HW_VAR_H2C_MEDIA_STATUS_RPT, (u8 *)&media_status);
        }
 
@@ -2239,13 +2145,12 @@ _func_enter_;
 
                #elif (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)) || defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER)
                rtw_cfg80211_indicate_sta_disassoc(adapter, pstadel->macaddr, *(u16*)pstadel->rsvd);
-               #endif //(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)) || defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER)
-#endif //CONFIG_IOCTL_CFG80211
+               #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)) || defined(CONFIG_CFG80211_FORCE_COMPATIBLE_2_6_37_UNDER) */
+#endif /* CONFIG_IOCTL_CFG80211 */
 
                return;
         }
 
-
        mlmeext_sta_del_event_callback(adapter);
 
        _enter_critical_bh(&pmlmepriv->lock, &irqL2);
@@ -2259,7 +2164,7 @@ _func_enter_;
                        rtw_set_roaming(adapter, adapter->registrypriv.max_roaming_times);
 #ifdef CONFIG_INTEL_WIDI
                if(adapter->mlmepriv.widi_state != INTEL_WIDI_STATE_CONNECTED)
-#endif // CONFIG_INTEL_WIDI
+#endif /*  CONFIG_INTEL_WIDI */
                if(*((unsigned short *)(pstadel->rsvd)) != WLAN_REASON_EXPIRATION_CHK)
                        rtw_set_roaming(adapter, 0); /* don't roam */
                #endif
@@ -2269,7 +2174,7 @@ _func_enter_;
                rtw_free_assoc_resources(adapter, 1);
                rtw_indicate_disconnect(adapter);
                _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
-               // remove the network entry in scanned_queue
+               /*  remove the network entry in scanned_queue */
                pwlan = rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->network.MacAddress);
                if (pwlan) {
                        pwlan->fixed = _FALSE;
@@ -2282,8 +2187,8 @@ _func_enter_;
                #else
 #ifdef CONFIG_INTEL_WIDI
                process_intel_widi_disconnect(adapter, 1);
-#endif // CONFIG_INTEL_WIDI
-               #endif //CONFIG_LAYER2_ROAMING
+#endif /*  CONFIG_INTEL_WIDI */
+               #endif /* CONFIG_LAYER2_ROAMING */
 
        }
 
@@ -2295,12 +2200,11 @@ _func_enter_;
                rtw_free_stainfo(adapter,  psta);
                _exit_critical_bh(&(pstapriv->sta_hash_lock), &irqL);
 
-               if(adapter->stapriv.asoc_sta_count== 1) //a sta + bc/mc_stainfo (not Ibss_stainfo)
+               if(adapter->stapriv.asoc_sta_count== 1) /* a sta + bc/mc_stainfo (not Ibss_stainfo) */
                {
-                       //rtw_indicate_disconnect(adapter);//removed@20091105
                        _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
-                       //free old ibss network
-                       //pwlan = rtw_find_network(&pmlmepriv->scanned_queue, pstadel->macaddr);
+                       /* free old ibss network */
+                       /* pwlan = rtw_find_network(&pmlmepriv->scanned_queue, pstadel->macaddr); */
                        pwlan = rtw_find_network(&pmlmepriv->scanned_queue, tgt_network->network.MacAddress);
                        if(pwlan)
                        {
@@ -2308,7 +2212,7 @@ _func_enter_;
                                rtw_free_network_nolock(pmlmepriv, pwlan);
                        }
                        _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
-                       //re-create ibss
+                       /* re-create ibss */
                        pdev_network = &(adapter->registrypriv.dev_network);
                        pibss = adapter->registrypriv.dev_network.MacAddress;
 
@@ -2334,7 +2238,6 @@ _func_enter_;
 
                        }
 
-
                }
 
        }
@@ -2342,10 +2245,8 @@ _func_enter_;
        _exit_critical_bh(&pmlmepriv->lock, &irqL2);
 
 _func_exit_;
-
 }
 
-
 void rtw_cpwm_event_callback(PADAPTER padapter, u8 *pbuf)
 {
 #ifdef CONFIG_LPS_LCLK
@@ -2362,7 +2263,6 @@ _func_enter_;
 #endif
 
 _func_exit_;
-
 }
 
 /*
@@ -2375,33 +2275,25 @@ void _rtw_join_timeout_handler (_adapter *adapter)
        struct  mlme_priv *pmlmepriv = &adapter->mlmepriv;
 #ifdef CONFIG_LAYER2_ROAMING
        int do_join_r;
-#endif //CONFIG_LAYER2_ROAMING
-
-#if 0
-       if (adapter->bDriverStopped == _TRUE){
-               _rtw_up_sema(&pmlmepriv->assoc_terminate);
-               return;
-       }
-#endif
+#endif /* CONFIG_LAYER2_ROAMING */
 
 _func_enter_;
 #ifdef PLATFORM_FREEBSD
                rtw_mtx_lock(NULL);
                 if (callout_pending(&adapter->mlmepriv.assoc_timer.callout)) {
                         /* callout was reset */
-                        //mtx_unlock(&sc->sc_mtx);
+                        /* mtx_unlock(&sc->sc_mtx); */
                         rtw_mtx_unlock(NULL);
                         return;
                 }
                 if (!callout_active(&adapter->mlmepriv.assoc_timer.callout)) {
                         /* callout was stopped */
-                        //mtx_unlock(&sc->sc_mtx);
+                        /* mtx_unlock(&sc->sc_mtx); */
                         rtw_mtx_unlock(NULL);
                         return;
                 }
                 callout_deactivate(&adapter->mlmepriv.assoc_timer.callout);
 
-
 #endif
 
        DBG_8723A("%s, fw_state=%x\n", __FUNCTION__, get_fwstate(pmlmepriv));
@@ -2409,7 +2301,6 @@ _func_enter_;
        if(adapter->bDriverStopped ||adapter->bSurpriseRemoved)
                return;
 
-
        _enter_critical_bh(&pmlmepriv->lock, &irqL);
 
        #ifdef CONFIG_LAYER2_ROAMING
@@ -2431,7 +2322,7 @@ _func_enter_;
                                        intel_widi_wk_cmd(adapter, INTEL_WIDI_LISTEN_WK, NULL);
                                        DBG_8723A("change to widi listen\n");
                                }
-#endif // CONFIG_INTEL_WIDI
+#endif /*  CONFIG_INTEL_WIDI */
                                DBG_8723A("%s We've try roaming but fail\n", __FUNCTION__);
                                rtw_indicate_disconnect(adapter);
                                break;
@@ -2442,18 +2333,17 @@ _func_enter_;
        #endif
        {
                rtw_indicate_disconnect(adapter);
-               free_scanqueue(pmlmepriv);//???
+               free_scanqueue(pmlmepriv);/*  */
 
 #ifdef CONFIG_IOCTL_CFG80211
-               //indicate disconnect for the case that join_timeout and check_fwstate != FW_LINKED
+               /* indicate disconnect for the case that join_timeout and check_fwstate != FW_LINKED */
                rtw_cfg80211_indicate_disconnect(adapter);
-#endif //CONFIG_IOCTL_CFG80211
+#endif /* CONFIG_IOCTL_CFG80211 */
 
        }
 
        _exit_critical_bh(&pmlmepriv->lock, &irqL);
 
-
 #ifdef CONFIG_DRVEXT_MODULE_WSC
        drvext_assoc_fail_indicate(&adapter->drvextpriv);
 #endif
@@ -2462,7 +2352,6 @@ _func_enter_;
 #endif
 
 _func_exit_;
-
 }
 
 /*
@@ -2483,7 +2372,6 @@ void rtw_scan_timeout_handler (_adapter *adapter)
        _exit_critical_bh(&pmlmepriv->lock, &irqL);
 
        rtw_indicate_scan_done(adapter, _TRUE);
-
 }
 
 static void rtw_auto_scan_handler(_adapter *padapter)
@@ -2491,7 +2379,7 @@ static void rtw_auto_scan_handler(_adapter *padapter)
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
        struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
 
-       //auto site survey per 60sec
+       /* auto site survey per 60sec */
        if(pmlmepriv->scan_interval >0)
        {
                pmlmepriv->scan_interval--;
@@ -2527,19 +2415,18 @@ static void rtw_auto_scan_handler(_adapter *padapter)
 
                        rtw_set_802_11_bssid_list_scan(padapter, NULL, 0);
 
-                       pmlmepriv->scan_interval = SCAN_INTERVAL;// 30*2 sec = 60sec
+                       pmlmepriv->scan_interval = SCAN_INTERVAL;/*  30*2 sec = 60sec */
 
                }
 
        }
-
 }
 
 void rtw_dynamic_check_timer_handler(_adapter *adapter)
 {
 #ifdef CONFIG_AP_MODE
        struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
-#endif //CONFIG_AP_MODE
+#endif /* CONFIG_AP_MODE */
        struct registry_priv *pregistrypriv = &adapter->registrypriv;
 #ifdef CONFIG_CONCURRENT_MODE
        PADAPTER pbuddy_adapter = adapter->pbuddy_adapter;
@@ -2557,7 +2444,6 @@ void rtw_dynamic_check_timer_handler(_adapter *adapter)
        if ((adapter->bDriverStopped == _TRUE)||(adapter->bSurpriseRemoved== _TRUE))
                return;
 
-
 #ifdef CONFIG_CONCURRENT_MODE
        if(pbuddy_adapter)
        {
@@ -2567,7 +2453,7 @@ void rtw_dynamic_check_timer_handler(_adapter *adapter)
                }
        }
        else
-#endif //CONFIG_CONCURRENT_MODE
+#endif /* CONFIG_CONCURRENT_MODE */
        if(adapter->net_closed == _TRUE)
        {
                return;
@@ -2582,7 +2468,7 @@ void rtw_dynamic_check_timer_handler(_adapter *adapter)
                if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
 #endif
                {
-                       //auto site survey
+                       /* auto site survey */
                        rtw_auto_scan_handler(adapter);
                }
        }
@@ -2594,22 +2480,22 @@ void rtw_dynamic_check_timer_handler(_adapter *adapter)
                expire_timeout_chk(adapter);
        }
 #endif
-#endif //!CONFIG_ACTIVE_KEEP_ALIVE_CHECK
+#endif /* CONFIG_ACTIVE_KEEP_ALIVE_CHECK */
 
 #ifdef CONFIG_BR_EXT
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35))
        rcu_read_lock();
-#endif // (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35))
+#endif /*  (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) */
 
 #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
        if( adapter->pnetdev->br_port
-#else  // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
+#else  /*  (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) */
        if( rcu_dereference(adapter->pnetdev->rx_handler_data)
-#endif // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
+#endif /*  (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) */
                && (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) )
        {
-               // expire NAT2.5 entry
+               /*  expire NAT2.5 entry */
                void nat25_db_expire(_adapter *priv);
                nat25_db_expire(adapter);
 
@@ -2617,7 +2503,7 @@ void rtw_dynamic_check_timer_handler(_adapter *adapter)
                        adapter->pppoe_connection_in_progress--;
                }
 
-               // due to rtw_dynamic_check_timer_handler() is called every 2 seconds
+               /*  due to rtw_dynamic_check_timer_handler() is called every 2 seconds */
                if (adapter->pppoe_connection_in_progress > 0) {
                        adapter->pppoe_connection_in_progress--;
                }
@@ -2625,13 +2511,11 @@ void rtw_dynamic_check_timer_handler(_adapter *adapter)
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35))
        rcu_read_unlock();
-#endif // (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35))
-
-#endif // CONFIG_BR_EXT
+#endif /*  (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) */
 
+#endif /*  CONFIG_BR_EXT */
 }
 
-
 #ifdef CONFIG_SET_SCAN_DENY_TIMER
 inline bool rtw_is_scan_deny(_adapter *adapter)
 {
@@ -2674,12 +2558,11 @@ void rtw_set_scan_deny(_adapter *adapter, u32 ms)
        ATOMIC_SET(&b_mlmepriv->set_scan_deny, 1);
        _set_timer(&b_mlmepriv->set_scan_deny_timer, ms);
 #endif
-
 }
 #endif
 
 #if defined(IEEE80211_SCAN_RESULT_EXPIRE)
-#define RTW_SCAN_RESULT_EXPIRE IEEE80211_SCAN_RESULT_EXPIRE/HZ*1000 -1000 //3000 -1000
+#define RTW_SCAN_RESULT_EXPIRE IEEE80211_SCAN_RESULT_EXPIRE/HZ*1000 -1000 /* 3000 -1000 */
 #else
 #define RTW_SCAN_RESULT_EXPIRE 2000
 #endif
@@ -2696,14 +2579,13 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv
        int updated = _FALSE;
        _adapter *adapter = container_of(pmlmepriv, _adapter, mlmepriv);
 
-
-       //check bssid, if needed
+       /* check bssid, if needed */
        if(pmlmepriv->assoc_by_bssid==_TRUE) {
                if(_rtw_memcmp(competitor->network.MacAddress, pmlmepriv->assoc_bssid, ETH_ALEN) ==_FALSE)
                        goto exit;
        }
 
-       //check ssid, if needed
+       /* check ssid, if needed */
        if(pmlmepriv->assoc_ssid.Ssid && pmlmepriv->assoc_ssid.SsidLength) {
                if(     competitor->network.Ssid.SsidLength != pmlmepriv->assoc_ssid.SsidLength
                        || _rtw_memcmp(competitor->network.Ssid.Ssid, pmlmepriv->assoc_ssid.Ssid, pmlmepriv->assoc_ssid.SsidLength) == _FALSE
@@ -2729,46 +2611,6 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv
                updated = _TRUE;
        }
 
-#if 0
-       if(pmlmepriv->assoc_by_bssid==_TRUE) { // associate with bssid
-               if(     (*candidate == NULL ||(*candidate)->network.Rssi<competitor->network.Rssi )
-                       && _rtw_memcmp(competitor->network.MacAddress, pmlmepriv->assoc_bssid, ETH_ALEN)==_TRUE
-               ) {
-                       *candidate = competitor;
-                       updated = _TRUE;
-               }
-       } else  if (pmlmepriv->assoc_ssid.SsidLength == 0 ) { // associate with ssid, but ssidlength is 0
-               if(     (*candidate == NULL ||(*candidate)->network.Rssi<competitor->network.Rssi ) ) {
-                       *candidate = competitor;
-                       updated = _TRUE;
-               }
-       } else
-#ifdef  CONFIG_LAYER2_ROAMING
-       if(rtw_to_roaming(adapter)) { // roaming
-               if(     (*candidate == NULL ||(*candidate)->network.Rssi<competitor->network.Rssi )
-                       && is_same_ess(&competitor->network, &pmlmepriv->cur_network.network)
-                       //&&(!is_same_network(&competitor->network, &pmlmepriv->cur_network.network))
-                       && rtw_get_passing_time_ms((u32)competitor->last_scanned) < RTW_SCAN_RESULT_EXPIRE
-                       && rtw_is_desired_network(adapter, competitor)
-               ) {
-                       *candidate = competitor;
-                       updated = _TRUE;
-               }
-
-       } else
-#endif
-       { // associate with ssid
-               if(     (*candidate == NULL ||(*candidate)->network.Rssi<competitor->network.Rssi )
-                       && (competitor->network.Ssid.SsidLength==pmlmepriv->assoc_ssid.SsidLength)
-                       &&((_rtw_memcmp(competitor->network.Ssid.Ssid, pmlmepriv->assoc_ssid.Ssid, pmlmepriv->assoc_ssid.SsidLength)) == _TRUE)
-                       && rtw_is_desired_network(adapter, competitor)
-               ) {
-                       *candidate = competitor;
-                       updated = _TRUE;
-               }
-       }
-#endif
-
        if(updated){
 #ifdef  CONFIG_LAYER2_ROAMING
                DBG_8723A("[by_bssid:%u][assoc_ssid:%s][to_roaming:%u] new candidate: %s("MAC_FMT") rssi:%d\n",
@@ -2801,7 +2643,6 @@ The caller must hold the following spinlock
 
 pmlmepriv->lock
 
-
 */
 
 int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv )
@@ -2834,10 +2675,6 @@ _func_enter_;
 
                pmlmepriv->pscanned = get_next(pmlmepriv->pscanned);
 
-               #if 0
-               DBG_8723A("MacAddress:"MAC_FMT" ssid:%s\n", MAC_ARG(pnetwork->network.MacAddress), pnetwork->network.Ssid.Ssid);
-               #endif
-
                rtw_check_join_candidate(pmlmepriv, &candidate, pnetwork);
 
        }
@@ -2855,29 +2692,14 @@ _func_enter_;
                        candidate->network.Configuration.DSConfig);
        }
 
-
-       // check for situation of  _FW_LINKED
+       /*  check for situation of  _FW_LINKED */
        if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE)
        {
                DBG_8723A("%s: _FW_LINKED while ask_for_joinbss!!!\n", __FUNCTION__);
 
-               #if 0 // for WPA/WPA2 authentication, wpa_supplicant will expect authentication from AP, it is needed to reconnect AP...
-               if(is_same_network(&pmlmepriv->cur_network.network, &candidate->network))
-               {
-                       DBG_8723A("%s: _FW_LINKED and is same network, it needn't join again\n", __FUNCTION__);
-
-                       rtw_indicate_connect(adapter);//rtw_indicate_connect again
-
-                       ret = 2;
-                       goto exit;
-               }
-               else
-               #endif
-               {
-                       rtw_disassoc_cmd(adapter, 0, _TRUE);
-                       rtw_indicate_disconnect(adapter);
-                       rtw_free_assoc_resources(adapter, 0);
-               }
+               rtw_disassoc_cmd(adapter, 0, _TRUE);
+               rtw_indicate_disconnect(adapter);
+               rtw_free_assoc_resources(adapter, 0);
        }
 
        #ifdef CONFIG_ANTENNA_DIVERSITY
@@ -2941,26 +2763,15 @@ _func_enter_;
 
                pmlmepriv->pscanned = get_next(pmlmepriv->pscanned);
 
-               #if 0
-               DBG_8723A("MacAddress:"MAC_FMT" ssid:%s\n", MAC_ARG(pnetwork->network.MacAddress), pnetwork->network.Ssid.Ssid);
-               #endif
-
                if(pmlmepriv->assoc_by_bssid==_TRUE)
                {
                        if(_rtw_memcmp(pnetwork->network.MacAddress, pmlmepriv->assoc_bssid, ETH_ALEN)==_TRUE)
                        {
-                               //remove the condition @ 20081125
-                               //if((pmlmepriv->cur_network.network.InfrastructureMode==Ndis802_11AutoUnknown)||
-                               //      pmlmepriv->cur_network.network.InfrastructureMode == pnetwork->network.InfrastructureMode)
-                               //              goto ask_for_joinbss;
-
                                if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE)
                                {
                                        if(is_same_network(&pmlmepriv->cur_network.network, &pnetwork->network))
                                        {
-                                               //DBG_8723A("select_and_join(1): _FW_LINKED and is same network, it needn't join again\n");
-
-                                               rtw_indicate_connect(adapter);//rtw_indicate_connect again
+                                               rtw_indicate_connect(adapter);/* rtw_indicate_connect again */
                                                _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
                                                return 2;
                                        }
@@ -2983,22 +2794,22 @@ _func_enter_;
                        }
 
                } else if (pmlmepriv->assoc_ssid.SsidLength == 0) {
-                       goto ask_for_joinbss;//anyway, join first selected(dequeued) pnetwork if ssid_len=0
+                       goto ask_for_joinbss;/* anyway, join first selected(dequeued) pnetwork if ssid_len=0 */
 
                #ifdef CONFIG_LAYER2_ROAMING
                } else if (rtw_to_roaming(adapter) > 0) {
 
                        if(     (roaming_candidate == NULL ||roaming_candidate->network.Rssi<pnetwork->network.Rssi )
                                && is_same_ess(&pnetwork->network, &pmlmepriv->cur_network.network)
-                               //&&(!is_same_network(&pnetwork->network, &pmlmepriv->cur_network.network))
+                               /* is_same_network(&pnetwork->network, &pmlmepriv->cur_network.network)) */
                                &&  rtw_get_time_interval_ms((u32)pnetwork->last_scanned,cur_time) < 5000
                                ) {
                                roaming_candidate = pnetwork;
-                               //RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,
+                               /* RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_, */
                                DBG_8723A
                                        ("roaming_candidate???: %s("MAC_FMT")\n",
                                        roaming_candidate->network.Ssid.Ssid, MAC_ARG(roaming_candidate->network.MacAddress) )
-                                       //)
+                                       /*  */
                                        ;
                        }
                        continue;
@@ -3015,15 +2826,7 @@ _func_enter_;
                                (2==pnetwork->network.PhyInfo.Optimum_antenna)?"A":"B",
                                (2==CurrentAntenna)?"A":"B");
 #endif
-                       //remove the condition @ 20081125
-                       //if((pmlmepriv->cur_network.network.InfrastructureMode==Ndis802_11AutoUnknown)||
-                       //      pmlmepriv->cur_network.network.InfrastructureMode == pnetwork->network.InfrastructureMode)
-                       //{
-                       //      _rtw_memcpy(pmlmepriv->assoc_bssid, pnetwork->network.MacAddress, ETH_ALEN);
-                       //      goto ask_for_joinbss;
-                       //}
-
-                       if(pmlmepriv->assoc_by_rssi==_TRUE)//if the ssid is the same, select the bss which has the max rssi
+                       if(pmlmepriv->assoc_by_rssi==_TRUE)/* if the ssid is the same, select the bss which has the max rssi */
                        {
                                if( NULL==pnetwork_max_rssi|| pnetwork->network.Rssi > pnetwork_max_rssi->network.Rssi)
                                                pnetwork_max_rssi = pnetwork;
@@ -3032,24 +2835,10 @@ _func_enter_;
                        {
                                if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE)
                                {
-#if 0
-                                       if(is_same_network(&pmlmepriv->cur_network.network, &pnetwork->network))
-                                       {
-                                               DBG_8723A("select_and_join(2): _FW_LINKED and is same network, it needn't join again\n");
-
-                                               rtw_indicate_connect(adapter);//rtw_indicate_connect again
-
-                                               return 2;
-                                       }
-                                       else
-#endif
-                                       {
-                                               rtw_disassoc_cmd(adapter, 0, _TRUE);
-                                               //rtw_indicate_disconnect(adapter);//
-                                               rtw_free_assoc_resources(adapter, 0);
-                                               _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
-                                               goto ask_for_joinbss;
-                                       }
+                                       rtw_disassoc_cmd(adapter, 0, _TRUE);
+                                       rtw_free_assoc_resources(adapter, 0);
+                                       _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
+                                       goto ask_for_joinbss;
                                }
                                else
                                {
@@ -3059,7 +2848,6 @@ _func_enter_;
 
                        }
 
-
                }
 
        }
@@ -3092,10 +2880,8 @@ ask_for_joinbss:
 _func_exit_;
 
        return rtw_joinbss_cmd(adapter, pnetwork);
-
 }
-#endif //PLATFORM_FREEBSD
-
+#endif /* PLATFORM_FREEBSD */
 
 sint rtw_set_auth(_adapter * adapter,struct security_priv *psecuritypriv)
 {
@@ -3108,7 +2894,7 @@ _func_enter_;
 
        pcmd = (struct  cmd_obj*)rtw_zmalloc(sizeof(struct      cmd_obj));
        if(pcmd==NULL){
-               res= _FAIL;  //try again
+               res= _FAIL;  /* try again */
                goto exit;
        }
 
@@ -3128,7 +2914,6 @@ _func_enter_;
        pcmd->rsp = NULL;
        pcmd->rspsz = 0;
 
-
        _rtw_init_listhead(&pcmd->list);
 
        RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("after enqueue set_auth_cmd, auth_mode=%x\n", psecuritypriv->dot11AuthAlgrthm));
@@ -3140,10 +2925,8 @@ exit:
 _func_exit_;
 
        return res;
-
 }
 
-
 sint rtw_set_key(_adapter * adapter,struct security_priv *psecuritypriv,sint keyid, u8 set_tx)
 {
        u8      keylen;
@@ -3157,7 +2940,7 @@ _func_enter_;
 
        pcmd = (struct  cmd_obj*)rtw_zmalloc(sizeof(struct      cmd_obj));
        if(pcmd==NULL){
-               res= _FAIL;  //try again
+               res= _FAIL;  /* try again */
                goto exit;
        }
        psetkeyparm=(struct setkey_parm*)rtw_zmalloc(sizeof(struct setkey_parm));
@@ -3178,7 +2961,7 @@ _func_enter_;
                RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n rtw_set_key: psetkeyparm->algorithm=(u8)psecuritypriv->dot11PrivacyAlgrthm=%d \n", psetkeyparm->algorithm));
 
        }
-       psetkeyparm->keyid = (u8)keyid;//0~3
+       psetkeyparm->keyid = (u8)keyid;/* 0~3 */
        psetkeyparm->set_tx = set_tx;
        if (is_wep_enc(psetkeyparm->algorithm))
                pmlmepriv->key_mask |= BIT(psetkeyparm->keyid);
@@ -3219,51 +3002,38 @@ _func_enter_;
                        goto exit;
        }
 
-
        pcmd->cmdcode = _SetKey_CMD_;
        pcmd->parmbuf = (u8 *)psetkeyparm;
        pcmd->cmdsz =  (sizeof(struct setkey_parm));
        pcmd->rsp = NULL;
        pcmd->rspsz = 0;
 
-
        _rtw_init_listhead(&pcmd->list);
 
-       //_rtw_init_sema(&(pcmd->cmd_sem), 0);
+       /* _rtw_init_sema(&(pcmd->cmd_sem), 0); */
 
        res = rtw_enqueue_cmd(pcmdpriv, pcmd);
 
 exit:
 _func_exit_;
        return res;
-
 }
 
-
-//adjust IEs for rtw_joinbss_cmd in WMM
+/* adjust IEs for rtw_joinbss_cmd in WMM */
 int rtw_restruct_wmm_ie(_adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len, uint initial_out_len)
 {
        unsigned        int ielength=0;
        unsigned int i, j;
 
-       i = 12; //after the fixed IE
+       i = 12; /* after the fixed IE */
        while(i<in_len)
        {
                ielength = initial_out_len;
 
-               if(in_ie[i] == 0xDD && in_ie[i+2] == 0x00 && in_ie[i+3] == 0x50  && in_ie[i+4] == 0xF2 && in_ie[i+5] == 0x02 && i+5 < in_len) //WMM element ID and OUI
+               if(in_ie[i] == 0xDD && in_ie[i+2] == 0x00 && in_ie[i+3] == 0x50  && in_ie[i+4] == 0xF2 && in_ie[i+5] == 0x02 && i+5 < in_len) /* WMM element ID and OUI */
                {
 
-                       //Append WMM IE to the last index of out_ie
-                       /*
-                       for(j=i; j< i+(in_ie[i+1]+2); j++)
-                       {
-                               out_ie[ielength] = in_ie[j];
-                               ielength++;
-                       }
-                       out_ie[initial_out_len+8] = 0x00; //force the QoS Info Field to be zero
-                       */
-
+                       /* Append WMM IE to the last index of out_ie */
                         for ( j = i; j < i + 9; j++ )
                         {
                             out_ie[ ielength] = in_ie[ j ];
@@ -3276,24 +3046,22 @@ int rtw_restruct_wmm_ie(_adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len, u
                        break;
                }
 
-               i+=(in_ie[i+1]+2); // to the next IE element
+               i+=(in_ie[i+1]+2); /*  to the next IE element */
        }
 
        return ielength;
-
 }
 
-
-//
-// Ported from 8185: IsInPreAuthKeyList(). (Renamed from SecIsInPreAuthKeyList(), 2006-10-13.)
-// Added by Annie, 2006-05-07.
-//
-// Search by BSSID,
-// Return Value:
-//             -1              :if there is no pre-auth key in the  table
-//             >=0             :if there is pre-auth key, and   return the entry id
-//
-//
+/*  */
+/*  Ported from 8185: IsInPreAuthKeyList(). (Renamed from SecIsInPreAuthKeyList(), 2006-10-13.) */
+/*  Added by Annie, 2006-05-07. */
+/*  */
+/*  Search by BSSID, */
+/*  Return Value: */
+/*             -1              :if there is no pre-auth key in the  table */
+/*             >=0             :if there is pre-auth key, and   return the entry id */
+/*  */
+/*  */
 
 static int SecIsInPMKIDList(_adapter *Adapter, u8 *bssid)
 {
@@ -3310,50 +3078,48 @@ static int SecIsInPMKIDList(_adapter *Adapter, u8 *bssid)
                else
                {
                        i++;
-                       //continue;
+                       /* continue; */
                }
 
        }while(i<NUM_PMKID_CACHE);
 
        if( i == NUM_PMKID_CACHE )
        {
-               i = -1;// Could not find.
+               i = -1;/*  Could not find. */
        }
        else
        {
-               // There is one Pre-Authentication Key for the specific BSSID.
+               /*  There is one Pre-Authentication Key for the specific BSSID. */
        }
 
        return (i);
-
 }
 
-//
-// Check the RSN IE length
-// If the RSN IE length <= 20, the RSN IE didn't include the PMKID information
-// 0-11th element in the array are the fixed IE
-// 12th element in the array is the IE
-// 13th element in the array is the IE length
-//
+/*  */
+/*  Check the RSN IE length */
+/*  If the RSN IE length <= 20, the RSN IE didn't include the PMKID information */
+/*  0-11th element in the array are the fixed IE */
+/*  12th element in the array is the IE */
+/*  13th element in the array is the IE length */
+/*  */
 
 static int rtw_append_pmkid(_adapter *Adapter,int iEntry, u8 *ie, uint ie_len)
 {
        struct security_priv *psecuritypriv=&Adapter->securitypriv;
 
        if(ie[13]<=20){
-               // The RSN IE didn't include the PMK ID, append the PMK information
+               /*  The RSN IE didn't include the PMK ID, append the PMK information */
                        ie[ie_len]=1;
                        ie_len++;
-                       ie[ie_len]=0;   //PMKID count = 0x0100
+                       ie[ie_len]=0;   /* PMKID count = 0x0100 */
                        ie_len++;
                        _rtw_memcpy(    &ie[ie_len], &psecuritypriv->PMKIDList[iEntry].PMKID, 16);
 
                        ie_len+=16;
-                       ie[13]+=18;//PMKID length = 2+16
+                       ie[13]+=18;/* PMKID length = 2+16 */
 
        }
        return (ie_len);
-
 }
 sint rtw_restruct_sec_ie(_adapter *adapter,u8 *in_ie, u8 *out_ie, uint in_len)
 {
@@ -3374,7 +3140,7 @@ _func_enter_;
                 ("+rtw_restruct_sec_ie: ndisauthmode=%d ndissecuritytype=%d\n",
                  ndisauthmode, ndissecuritytype));
 
-       //copy fixed ie only
+       /* copy fixed ie only */
        _rtw_memcpy(out_ie, in_ie,12);
        ielength=12;
        if((ndisauthmode==Ndis802_11AuthModeWPA)||(ndisauthmode==Ndis802_11AuthModeWPAPSK))
@@ -3390,7 +3156,7 @@ _func_enter_;
        }
        else if((authmode==_WPA_IE_ID_)||(authmode==_WPA2_IE_ID_))
        {
-               //copy RSN or SSN
+               /* copy RSN or SSN */
                _rtw_memcpy(&out_ie[ielength], &psecuritypriv->supplicant_ie[0], psecuritypriv->supplicant_ie[1]+2);
                ielength+=psecuritypriv->supplicant_ie[1]+2;
                rtw_report_sec_ie(adapter, authmode, psecuritypriv->supplicant_ie);
@@ -3438,9 +3204,7 @@ _func_enter_;
        pdev_network->Configuration.FHConfig.HopSet = 0;
        pdev_network->Configuration.FHConfig.DwellTime = 0;
 
-
 _func_exit_;
-
 }
 
 void rtw_update_registrypriv_dev_network(_adapter* adapter)
@@ -3450,21 +3214,11 @@ void rtw_update_registrypriv_dev_network(_adapter* adapter)
        WLAN_BSSID_EX    *pdev_network = &pregistrypriv->dev_network;
        struct  security_priv*  psecuritypriv = &adapter->securitypriv;
        struct  wlan_network    *cur_network = &adapter->mlmepriv.cur_network;
-       //struct        xmit_priv       *pxmitpriv = &adapter->xmitpriv;
+       /* struct       xmit_priv       *pxmitpriv = &adapter->xmitpriv; */
 
 _func_enter_;
 
-#if 0
-       pxmitpriv->vcs_setting = pregistrypriv->vrtl_carrier_sense;
-       pxmitpriv->vcs = pregistrypriv->vcs_type;
-       pxmitpriv->vcs_type = pregistrypriv->vcs_type;
-       //pxmitpriv->rts_thresh = pregistrypriv->rts_thresh;
-       pxmitpriv->frag_len = pregistrypriv->frag_thresh;
-
-       adapter->qospriv.qos_option = pregistrypriv->wmm_enable;
-#endif
-
-       pdev_network->Privacy = (psecuritypriv->dot11PrivacyAlgrthm > 0 ? 1 : 0) ; // adhoc no 802.1x
+       pdev_network->Privacy = (psecuritypriv->dot11PrivacyAlgrthm > 0 ? 1 : 0) ; /*  adhoc no 802.1x */
 
        pdev_network->Rssi = 0;
 
@@ -3491,7 +3245,7 @@ _func_enter_;
                                pdev_network->NetworkTypeInUse = (Ndis802_11OFDM24);
                        break;
                default :
-                       // TODO
+                       /*  TODO */
                        break;
        }
 
@@ -3503,33 +3257,29 @@ _func_enter_;
 
        pdev_network->InfrastructureMode = (cur_network->network.InfrastructureMode);
 
-       // 1. Supported rates
-       // 2. IE
+       /*  1. Supported rates */
+       /*  2. IE */
 
-       //rtw_set_supported_rate(pdev_network->SupportedRates, pregistrypriv->wireless_mode) ; // will be called in rtw_generate_ie
        sz = rtw_generate_ie(pregistrypriv);
 
        pdev_network->IELength = sz;
 
        pdev_network->Length = get_WLAN_BSSID_EX_sz((WLAN_BSSID_EX  *)pdev_network);
 
-       //notes: translate IELength & Length after assign the Length to cmdsz in createbss_cmd();
-       //pdev_network->IELength = cpu_to_le32(sz);
+       /* notes: translate IELength & Length after assign the Length to cmdsz in createbss_cmd(); */
+       /* pdev_network->IELength = cpu_to_le32(sz); */
 
 _func_exit_;
-
 }
 
 void rtw_get_encrypt_decrypt_from_registrypriv(_adapter* adapter)
 {
 _func_enter_;
 
-
 _func_exit_;
-
 }
 
-//the fucntion is at passive_level
+/* the fucntion is at passive_level */
 void rtw_joinbss_reset(_adapter *padapter)
 {
        u8      threshold;
@@ -3539,10 +3289,7 @@ void rtw_joinbss_reset(_adapter *padapter)
        struct ht_priv          *phtpriv = &pmlmepriv->htpriv;
 #endif
 
-       //todo: if you want to do something io/reg/hw setting before join_bss, please add code here
-
-
-
+       /* todo: if you want to do something io/reg/hw setting before join_bss, please add code here */
 
 #ifdef CONFIG_80211N_HT
 
@@ -3550,11 +3297,11 @@ void rtw_joinbss_reset(_adapter *padapter)
 
        pmlmepriv->num_sta_no_ht = 0;
 
-       phtpriv->ampdu_enable = _FALSE;//reset to disabled
+       phtpriv->ampdu_enable = _FALSE;/* reset to disabled */
 
 #ifdef CONFIG_USB_HCI
-       // TH=1 => means that invalidate usb rx aggregation
-       // TH=0 => means that validate usb rx aggregation, use init value.
+       /*  TH=1 => means that invalidate usb rx aggregation */
+       /*  TH=0 => means that validate usb rx aggregation, use init value. */
        if(phtpriv->ht_option)
        {
                if(padapter->registrypriv.wifi_spec==1)
@@ -3571,13 +3318,11 @@ void rtw_joinbss_reset(_adapter *padapter)
 #endif
 
 #endif
-
 }
 
-
 #ifdef CONFIG_80211N_HT
 
-//the fucntion is >= passive_level
+/* the fucntion is >= passive_level */
 unsigned int rtw_restructure_ht_ie(_adapter *padapter, u8 *in_ie, u8 *out_ie, uint in_len, uint *pout_len)
 {
        u32 ielen, out_len;
@@ -3589,7 +3334,6 @@ unsigned int rtw_restructure_ht_ie(_adapter *padapter, u8 *in_ie, u8 *out_ie, ui
        struct qos_priv         *pqospriv= &pmlmepriv->qospriv;
        struct ht_priv          *phtpriv = &pmlmepriv->htpriv;
 
-
        phtpriv->ht_option = _FALSE;
 
        p = rtw_get_ie(in_ie+12, _HT_CAPABILITY_IE_, &ielen, in_len-12);
@@ -3613,15 +3357,14 @@ unsigned int rtw_restructure_ht_ie(_adapter *padapter, u8 *in_ie, u8 *out_ie, ui
                                                        IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_TX_STBC |
                                                        IEEE80211_HT_CAP_DSSSCCK40;
 
-
                {
                        u32 rx_packet_offset, max_recvbuf_sz;
                        rtw_hal_get_def_var(padapter, HAL_DEF_RX_PACKET_OFFSET, &rx_packet_offset);
                        rtw_hal_get_def_var(padapter, HAL_DEF_MAX_RECVBUF_SZ, &max_recvbuf_sz);
-                       //if(max_recvbuf_sz-rx_packet_offset>(8191-256)) {
-                       //      DBG_8723A("%s IEEE80211_HT_CAP_MAX_AMSDU is set\n", __FUNCTION__);
-                       //      ht_capie.cap_info = ht_capie.cap_info |IEEE80211_HT_CAP_MAX_AMSDU;
-                       //}
+                       /* if(max_recvbuf_sz-rx_packet_offset>(8191-256)) { */
+                       /*      DBG_8723A("%s IEEE80211_HT_CAP_MAX_AMSDU is set\n", __FUNCTION__); */
+                       /*      ht_capie.cap_info = ht_capie.cap_info |IEEE80211_HT_CAP_MAX_AMSDU; */
+                       /*  */
                }
                /*
                AMPDU_para [1:0]:Max AMPDU Len => 0:8k , 1:16k, 2:32k, 3:64k
@@ -3644,15 +3387,9 @@ unsigned int rtw_restructure_ht_ie(_adapter *padapter, u8 *in_ie, u8 *out_ie, ui
                else
                        ht_capie.ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY&0x00);
 
-
                pframe = rtw_set_ie(out_ie+out_len, _HT_CAPABILITY_IE_,
                                                        sizeof(struct rtw_ieee80211_ht_cap), (unsigned char*)&ht_capie, pout_len);
 
-
-               //_rtw_memcpy(out_ie+out_len, p, ielen+2);//gtest
-               //*pout_len = *pout_len + (ielen+2);
-
-
                phtpriv->ht_option = _TRUE;
 
                p = rtw_get_ie(in_ie+12, _HT_ADD_INFO_IE_, &ielen, in_len-12);
@@ -3665,27 +3402,25 @@ unsigned int rtw_restructure_ht_ie(_adapter *padapter, u8 *in_ie, u8 *out_ie, ui
        }
 
        return (phtpriv->ht_option);
-
 }
 
-//the fucntion is > passive_level (in critical_section)
+/* the fucntion is > passive_level (in critical_section) */
 void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len)
 {
        u8 *p, max_ampdu_sz;
        int len;
-       //struct sta_info *bmc_sta, *psta;
+       /* struct sta_info *bmc_sta, *psta; */
        struct rtw_ieee80211_ht_cap *pht_capie;
        struct ieee80211_ht_addt_info *pht_addtinfo;
-       //struct recv_reorder_ctrl *preorder_ctrl;
+       /* struct recv_reorder_ctrl *preorder_ctrl; */
        struct mlme_priv        *pmlmepriv = &padapter->mlmepriv;
        struct ht_priv          *phtpriv = &pmlmepriv->htpriv;
-       //struct recv_priv *precvpriv = &padapter->recvpriv;
+       /* struct recv_priv *precvpriv = &padapter->recvpriv; */
        struct registry_priv *pregistrypriv = &padapter->registrypriv;
-       //struct wlan_network *pcur_network = &(pmlmepriv->cur_network);;
+       /* struct wlan_network *pcur_network = &(pmlmepriv->cur_network);; */
        struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
        struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
 
-
        if(!phtpriv->ht_option)
                return;
 
@@ -3694,7 +3429,7 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len)
 
        DBG_8723A("+rtw_update_ht_cap()\n");
 
-       //maybe needs check if ap supports rx ampdu.
+       /* maybe needs check if ap supports rx ampdu. */
        if((phtpriv->ampdu_enable==_FALSE) &&(pregistrypriv->ampdu_enable==1))
        {
                if(pregistrypriv->wifi_spec==1)
@@ -3711,32 +3446,29 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len)
                phtpriv->ampdu_enable = _TRUE;
        }
 
-
-       //check Max Rx A-MPDU Size
+       /* check Max Rx A-MPDU Size */
        len = 0;
        p = rtw_get_ie(pie+sizeof (NDIS_802_11_FIXED_IEs), _HT_CAPABILITY_IE_, &len, ie_len-sizeof (NDIS_802_11_FIXED_IEs));
        if(p && len>0)
        {
                pht_capie = (struct rtw_ieee80211_ht_cap *)(p+2);
                max_ampdu_sz = (pht_capie->ampdu_params_info & IEEE80211_HT_CAP_AMPDU_FACTOR);
-               max_ampdu_sz = 1 << (max_ampdu_sz+3); // max_ampdu_sz (kbytes);
+               max_ampdu_sz = 1 << (max_ampdu_sz+3); /*  max_ampdu_sz (kbytes); */
 
-               //DBG_8723A("rtw_update_ht_cap(): max_ampdu_sz=%d\n", max_ampdu_sz);
+               /* DBG_8723A("rtw_update_ht_cap(): max_ampdu_sz=%d\n", max_ampdu_sz); */
                phtpriv->rx_ampdu_maxlen = max_ampdu_sz;
 
        }
 
-
        len=0;
        p = rtw_get_ie(pie+sizeof (NDIS_802_11_FIXED_IEs), _HT_ADD_INFO_IE_, &len, ie_len-sizeof (NDIS_802_11_FIXED_IEs));
        if(p && len>0)
        {
                pht_addtinfo = (struct ieee80211_ht_addt_info *)(p+2);
-               //todo:
+               /* todo: */
        }
 
-
-       //update cur_bwmode & cur_ch_offset
+       /* update cur_bwmode & cur_ch_offset */
        if ((pregistrypriv->cbw40_enable) &&
                (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info & BIT(1)) &&
                (pmlmeinfo->HT_info.infos[0] & BIT(2)))
@@ -3746,7 +3478,7 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len)
 
                padapter->HalFunc.GetHwRegHandler(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type));
 
-               //update the MCS rates
+               /* update the MCS rates */
                for (i = 0; i < 16; i++)
                {
                        if((rf_type == RF_1T1R) || (rf_type == RF_1T2R))
@@ -3764,7 +3496,7 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len)
                                        pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R[i];
                                #else
                                pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R[i];
-                               #endif //CONFIG_DISABLE_MCS13TO15
+                               #endif /* CONFIG_DISABLE_MCS13TO15 */
                        }
                        #ifdef RTL8192C_RECONFIG_TO_1T1R
                        {
@@ -3772,7 +3504,7 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len)
                        }
                        #endif
                }
-               //switch to the 40M Hz mode accoring to the AP
+               /* switch to the 40M Hz mode accoring to the AP */
                pmlmeext->cur_bwmode = HT_CHANNEL_WIDTH_40;
                switch ((pmlmeinfo->HT_info.infos[0] & 0x3))
                {
@@ -3790,69 +3522,17 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len)
                }
        }
 
-       //
-       // Config SM Power Save setting
-       //
+       /*  */
+       /*  Config SM Power Save setting */
+       /*  */
        pmlmeinfo->SM_PS = (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info & 0x0C) >> 2;
        if(pmlmeinfo->SM_PS == WLAN_HT_CAP_SM_PS_STATIC)
-       {
-               /*u8 i;
-               //update the MCS rates
-               for (i = 0; i < 16; i++)
-               {
-                       pmlmeinfo->HT_caps.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i];
-               }*/
                DBG_8723A("%s(): WLAN_HT_CAP_SM_PS_STATIC\n",__FUNCTION__);
-       }
 
-       //
-       // Config current HT Protection mode.
-       //
+       /*  */
+       /*  Config current HT Protection mode. */
+       /*  */
        pmlmeinfo->HT_protection = pmlmeinfo->HT_info.infos[1] & 0x3;
-
-
-
-#if 0 //move to rtw_update_sta_info_client()
-       //for A-MPDU Rx reordering buffer control for bmc_sta & sta_info
-       //if A-MPDU Rx is enabled, reseting  rx_ordering_ctrl wstart_b(indicate_seq) to default value=0xffff
-       //todo: check if AP can send A-MPDU packets
-       bmc_sta = rtw_get_bcmc_stainfo(padapter);
-       if(bmc_sta)
-       {
-               for(i=0; i < 16 ; i++)
-               {
-                       //preorder_ctrl = &precvpriv->recvreorder_ctrl[i];
-                       preorder_ctrl = &bmc_sta->recvreorder_ctrl[i];
-                       preorder_ctrl->enable = _FALSE;
-                       preorder_ctrl->indicate_seq = 0xffff;
-                       #ifdef DBG_RX_SEQ
-                       DBG_8723A("DBG_RX_SEQ %s:%d indicate_seq:%u \n", __FUNCTION__, __LINE__,
-                               preorder_ctrl->indicate_seq);
-                       #endif
-                       preorder_ctrl->wend_b= 0xffff;
-                       preorder_ctrl->wsize_b = 64;//max_ampdu_sz;//ex. 32(kbytes) -> wsize_b=32
-               }
-       }
-
-       psta = rtw_get_stainfo(&padapter->stapriv, pcur_network->network.MacAddress);
-       if(psta)
-       {
-               for(i=0; i < 16 ; i++)
-               {
-                       //preorder_ctrl = &precvpriv->recvreorder_ctrl[i];
-                       preorder_ctrl = &psta->recvreorder_ctrl[i];
-                       preorder_ctrl->enable = _FALSE;
-                       preorder_ctrl->indicate_seq = 0xffff;
-                       #ifdef DBG_RX_SEQ
-                       DBG_8723A("DBG_RX_SEQ %s:%d indicate_seq:%u \n", __FUNCTION__, __LINE__,
-                               preorder_ctrl->indicate_seq);
-                       #endif
-                       preorder_ctrl->wend_b= 0xffff;
-                       preorder_ctrl->wsize_b = 64;//max_ampdu_sz;//ex. 32(kbytes) -> wsize_b=32
-               }
-       }
-#endif
-
 }
 
 void rtw_issue_addbareq_cmd(_adapter *padapter, struct xmit_frame *pxmitframe)
@@ -3864,7 +3544,6 @@ void rtw_issue_addbareq_cmd(_adapter *padapter, struct xmit_frame *pxmitframe)
        struct pkt_attrib *pattrib =&pxmitframe->attrib;
        s32 bmcst = IS_MCAST(pattrib->ra);
 
-       //if(bmcst || (padapter->mlmepriv.LinkDetectInfo.bTxBusyTraffic == _FALSE))
        if(bmcst || (padapter->mlmepriv.LinkDetectInfo.NumTxOkInPeriod<100))
                return;
 
@@ -3890,7 +3569,6 @@ void rtw_issue_addbareq_cmd(_adapter *padapter, struct xmit_frame *pxmitframe)
                return;
        }
 
-
        phtpriv = &psta->htpriv;
 
        if((phtpriv->ht_option==_TRUE) && (phtpriv->ampdu_enable==_TRUE))
@@ -3905,7 +3583,6 @@ void rtw_issue_addbareq_cmd(_adapter *padapter, struct xmit_frame *pxmitframe)
                        rtw_addbareq_cmd(padapter,(u8) priority, pattrib->ra);
                }
        }
-
 }
 
 #endif
@@ -3973,7 +3650,6 @@ void _rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network)
                        }
                }
        }
-
 }
 #endif
 
@@ -3986,7 +3662,7 @@ sint rtw_linked_check(_adapter *padapter)
                        return _TRUE;
        }
        else
-       {       //Station mode
+       {       /* Station mode */
                if(check_fwstate(&padapter->mlmepriv, _FW_LINKED)== _TRUE)
                        return _TRUE;
        }
@@ -4001,7 +3677,6 @@ sint rtw_buddy_adapter_up(_adapter *padapter)
        if(padapter == NULL)
                return res;
 
-
        if(padapter->pbuddy_adapter == NULL)
        {
                res = _FALSE;
@@ -4017,7 +3692,6 @@ sint rtw_buddy_adapter_up(_adapter *padapter)
        }
 
        return res;
-
 }
 
 sint check_buddy_fwstate(_adapter *padapter, sint state)
@@ -4038,4 +3712,4 @@ sint check_buddy_fwstate(_adapter *padapter, sint state)
        return _FALSE;
 }
 
-#endif //CONFIG_CONCURRENT_MODE
+#endif /* CONFIG_CONCURRENT_MODE */