OSDN Git Service

staging: rtl8723bs: update to the latest driver
[android-x86/kernel.git] / drivers / staging / rtl8723bs / core / rtw_ap.c
index 87d6dbc..ae28c92 100644 (file)
  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- *
  ******************************************************************************/
 #define _RTW_AP_C_
 
 #include <drv_types.h>
+#include <rtw_debug.h>
 
-extern unsigned char   RTW_WPA_OUI[];
-extern unsigned char   WMM_OUI[];
-extern unsigned char   WPS_OUI[];
-extern unsigned char   P2P_OUI[];
-extern unsigned char   WFD_OUI[];
+extern unsigned char RTW_WPA_OUI[];
+extern unsigned char WMM_OUI[];
+extern unsigned char WPS_OUI[];
+extern unsigned char P2P_OUI[];
+extern unsigned char WFD_OUI[];
 
-void init_mlme_ap_info(_adapter *padapter)
+void init_mlme_ap_info(struct adapter *padapter)
 {
-       struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
        struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
        struct sta_priv *pstapriv = &padapter->stapriv;
        struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
@@ -37,24 +32,22 @@ void init_mlme_ap_info(_adapter *padapter)
 
        spin_lock_init(&pmlmepriv->bcn_update_lock);
 
-       //for ACL
+       /* for ACL */
        _rtw_init_queue(&pacl_list->acl_node_q);
 
-       //pmlmeext->bstart_bss = false;
+       /* pmlmeext->bstart_bss = false; */
 
        start_ap_mode(padapter);
 }
 
-void free_mlme_ap_info(_adapter *padapter)
+void free_mlme_ap_info(struct adapter *padapter)
 {
-       _irqL irqL;
-       struct sta_info *psta=NULL;
-       struct sta_priv *pstapriv = &padapter->stapriv;
+       struct sta_info *psta = NULL;
        struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
        struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
-       struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
+       struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
 
-       //stop_ap_mode(padapter);
+       /* stop_ap_mode(padapter); */
 
        pmlmepriv->update_bcn = false;
        pmlmeext->bstart_bss = false;
@@ -63,32 +56,30 @@ void free_mlme_ap_info(_adapter *padapter)
 
        pmlmeinfo->state = _HW_STATE_NOLINK_;
 
-       //free_assoc_sta_resources
+       /* free_assoc_sta_resources */
        rtw_free_all_stainfo(padapter);
 
-       //free bc/mc sta_info
+       /* free bc/mc sta_info */
        psta = rtw_get_bcmc_stainfo(padapter);
-       spin_lock_bh(&(pstapriv->sta_hash_lock));
        rtw_free_stainfo(padapter, psta);
-       spin_unlock_bh(&(pstapriv->sta_hash_lock));
 }
 
-static void update_BCNTIM(_adapter *padapter)
+static void update_BCNTIM(struct adapter *padapter)
 {
        struct sta_priv *pstapriv = &padapter->stapriv;
        struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
        struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
-       WLAN_BSSID_EX *pnetwork_mlmeext = &(pmlmeinfo->network);
+       struct wlan_bssid_ex *pnetwork_mlmeext = &(pmlmeinfo->network);
        unsigned char *pie = pnetwork_mlmeext->IEs;
 
-       //DBG_871X("%s\n", __FUNCTION__);
+       /* DBG_871X("%s\n", __func__); */
 
-       //update TIM IE
-       //if(pstapriv->tim_bitmap)
-       if(true)
+       /* update TIM IE */
+       /* if (pstapriv->tim_bitmap) */
+       if (true)
        {
-               u8 *p, *dst_ie, *premainder_ie=NULL, *pbackup_remainder_ie=NULL;
-               u16 tim_bitmap_le;
+               u8 *p, *dst_ie, *premainder_ie = NULL, *pbackup_remainder_ie = NULL;
+               __le16 tim_bitmap_le;
                uint offset, tmp_len, tim_ielen, tim_ie_offset, remainder_ielen;
 
                tim_bitmap_le = cpu_to_le16(pstapriv->tim_bitmap);
@@ -104,14 +95,14 @@ static void update_BCNTIM(_adapter *padapter)
 
                        remainder_ielen = pnetwork_mlmeext->IELength - tim_ie_offset - tim_ielen;
 
-                       //append TIM IE from dst_ie offset
+                       /* append TIM IE from dst_ie offset */
                        dst_ie = p;
                }
                else
                {
                        tim_ielen = 0;
 
-                       //calucate head_len
+                       /* calucate head_len */
                        offset = _FIXED_IE_LENGTH_;
 
                        /* get ssid_ie len */
@@ -119,72 +110,70 @@ static void update_BCNTIM(_adapter *padapter)
                        if (p != NULL)
                                offset += tmp_len+2;
 
-                       // get supported rates len
+                       /*  get supported rates len */
                        p = rtw_get_ie(pie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_, &tmp_len, (pnetwork_mlmeext->IELength - _BEACON_IE_OFFSET_));
                        if (p !=  NULL)
                        {
                                offset += tmp_len+2;
                        }
 
-                       //DS Parameter Set IE, len=3
+                       /* DS Parameter Set IE, len =3 */
                        offset += 3;
 
                        premainder_ie = pie + offset;
 
                        remainder_ielen = pnetwork_mlmeext->IELength - offset - tim_ielen;
 
-                       //append TIM IE from offset
+                       /* append TIM IE from offset */
                        dst_ie = pie + offset;
 
                }
 
 
-               if(remainder_ielen>0)
+               if (remainder_ielen>0)
                {
                        pbackup_remainder_ie = rtw_malloc(remainder_ielen);
-                       if(pbackup_remainder_ie && premainder_ie)
+                       if (pbackup_remainder_ie && premainder_ie)
                                memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen);
                }
 
-               *dst_ie++=_TIM_IE_;
+               *dst_ie++ = _TIM_IE_;
 
-               if((pstapriv->tim_bitmap&0xff00) && (pstapriv->tim_bitmap&0x00fe))
+               if ((pstapriv->tim_bitmap&0xff00) && (pstapriv->tim_bitmap&0x00fe))
                        tim_ielen = 5;
                else
                        tim_ielen = 4;
 
-               *dst_ie++= tim_ielen;
+               *dst_ie++ = tim_ielen;
 
-               *dst_ie++=0;//DTIM count
-               *dst_ie++=1;//DTIM peroid
+               *dst_ie++ = 0;/* DTIM count */
+               *dst_ie++ = 1;/* DTIM peroid */
 
-               if(pstapriv->tim_bitmap&BIT(0))//for bc/mc frames
-                       *dst_ie++ = BIT(0);//bitmap ctrl
+               if (pstapriv->tim_bitmap&BIT(0))/* for bc/mc frames */
+                       *dst_ie++ = BIT(0);/* bitmap ctrl */
                else
                        *dst_ie++ = 0;
 
-               if(tim_ielen==4)
+               if (tim_ielen ==4)
                {
-                       u8 pvb=0;
+                       __le16 pvb;
 
-                       if(pstapriv->tim_bitmap&0x00fe)
-                               pvb = (u8)tim_bitmap_le;
-                       else if(pstapriv->tim_bitmap&0xff00)
-                               pvb = (u8)(tim_bitmap_le>>8);
+                       if (pstapriv->tim_bitmap&0xff00)
+                               pvb = cpu_to_le16(pstapriv->tim_bitmap >> 8);
                        else
-                               pvb = (u8)tim_bitmap_le;
+                               pvb = tim_bitmap_le;
 
-                       *dst_ie++ = pvb;
+                       *dst_ie++ = le16_to_cpu(pvb);
 
                }
-               else if(tim_ielen==5)
+               else if (tim_ielen ==5)
                {
                        memcpy(dst_ie, &tim_bitmap_le, 2);
                        dst_ie+=2;
                }
 
-               //copy remainder IE
-               if(pbackup_remainder_ie)
+               /* copy remainder IE */
+               if (pbackup_remainder_ie)
                {
                        memcpy(dst_ie, pbackup_remainder_ie, remainder_ielen);
 
@@ -204,7 +193,7 @@ u8 chk_sta_is_alive(struct sta_info *psta)
        DBG_871X("sta:"MAC_FMT", rssi:%d, rx:"STA_PKTS_FMT", expire_to:%u, %s%ssq_len:%u\n"
                , MAC_ARG(psta->hwaddr)
                , psta->rssi_stat.UndecoratedSmoothedPWDB
-               //, STA_RX_PKTS_ARG(psta)
+               /*  STA_RX_PKTS_ARG(psta) */
                , STA_RX_PKTS_DIFF_ARG(psta)
                , psta->expire_to
                , psta->state&WIFI_SLEEP_STATE?"PS, ":""
@@ -218,12 +207,11 @@ u8 chk_sta_is_alive(struct sta_info *psta)
        return true;
 }
 
-void   expire_timeout_chk(_adapter *padapter)
+void expire_timeout_chk(struct adapter *padapter)
 {
-       _irqL irqL;
-       _list   *phead, *plist;
+       struct list_head        *phead, *plist;
        u8 updated = false;
-       struct sta_info *psta=NULL;
+       struct sta_info *psta = NULL;
        struct sta_priv *pstapriv = &padapter->stapriv;
        u8 chk_alive_num = 0;
        char chk_alive_list[NUM_STA];
@@ -235,7 +223,7 @@ void        expire_timeout_chk(_adapter *padapter)
        phead = &pstapriv->auth_list;
        plist = get_next(phead);
 
-       //check auth_queue
+       /* check auth_queue */
        #ifdef DBG_EXPIRATION_CHK
        if (phead != plist) {
                DBG_871X(FUNC_NDEV_FMT" auth_list, cnt:%u\n"
@@ -248,7 +236,7 @@ void        expire_timeout_chk(_adapter *padapter)
 
                plist = get_next(plist);
 
-               if(psta->expire_to>0)
+               if (psta->expire_to>0)
                {
                        psta->expire_to--;
                        if (psta->expire_to == 0)
@@ -257,13 +245,11 @@ void      expire_timeout_chk(_adapter *padapter)
                                pstapriv->auth_list_cnt--;
 
                                DBG_871X("auth expire %02X%02X%02X%02X%02X%02X\n",
-                                       psta->hwaddr[0],psta->hwaddr[1],psta->hwaddr[2],psta->hwaddr[3],psta->hwaddr[4],psta->hwaddr[5]);
+                                       psta->hwaddr[0], psta->hwaddr[1], psta->hwaddr[2], psta->hwaddr[3], psta->hwaddr[4], psta->hwaddr[5]);
 
                                spin_unlock_bh(&pstapriv->auth_list_lock);
 
-                               spin_lock_bh(&(pstapriv->sta_hash_lock));
                                rtw_free_stainfo(padapter, psta);
-                               spin_unlock_bh(&(pstapriv->sta_hash_lock));
 
                                spin_lock_bh(&pstapriv->auth_list_lock);
                        }
@@ -280,7 +266,7 @@ void        expire_timeout_chk(_adapter *padapter)
        phead = &pstapriv->asoc_list;
        plist = get_next(phead);
 
-       //check asoc_queue
+       /* check asoc_queue */
        #ifdef DBG_EXPIRATION_CHK
        if (phead != plist) {
                DBG_871X(FUNC_NDEV_FMT" asoc_list, cnt:%u\n"
@@ -292,7 +278,7 @@ void        expire_timeout_chk(_adapter *padapter)
                psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list);
                plist = get_next(plist);
 #ifdef CONFIG_AUTO_AP_MODE
-               if(psta->isrc)
+               if (psta->isrc)
                        continue;
 #endif
                if (chk_sta_is_alive(psta) || !psta->expire_to) {
@@ -300,10 +286,11 @@ void      expire_timeout_chk(_adapter *padapter)
                        psta->keep_alive_trycnt = 0;
                        psta->under_exist_checking = 0;
                } else {
-                       psta->expire_to--;
+                       if (psta->expire_to > 0)
+                               psta->expire_to--;
                }
 
-               if (psta->expire_to <= 0)
+               if (psta->expire_to == 0)
                {
                        struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
 
@@ -315,17 +302,17 @@ void      expire_timeout_chk(_adapter *padapter)
 
                        if (psta->state & WIFI_SLEEP_STATE) {
                                if (!(psta->state & WIFI_STA_ALIVE_CHK_STATE)) {
-                                       //to check if alive by another methods if staion is at ps mode.
+                                       /* to check if alive by another methods if staion is at ps mode. */
                                        psta->expire_to = pstapriv->expire_to;
                                        psta->state |= WIFI_STA_ALIVE_CHK_STATE;
 
-                                       //DBG_871X("alive chk, sta:" MAC_FMT " is at ps mode!\n", MAC_ARG(psta->hwaddr));
+                                       /* DBG_871X("alive chk, sta:" MAC_FMT " is at ps mode!\n", MAC_ARG(psta->hwaddr)); */
 
-                                       //to update bcn with tim_bitmap for this station
+                                       /* to update bcn with tim_bitmap for this station */
                                        pstapriv->tim_bitmap |= BIT(psta->aid);
                                        update_beacon(padapter, _TIM_IE_, NULL, true);
 
-                                       if(!pmlmeext->active_keep_alive_check)
+                                       if (!pmlmeext->active_keep_alive_check)
                                                continue;
                                }
                        }
@@ -341,7 +328,7 @@ void        expire_timeout_chk(_adapter *padapter)
                        }
                        list_del_init(&psta->asoc_list);
                        pstapriv->asoc_list_cnt--;
-                       DBG_871X("asoc expire "MAC_FMT", state=0x%x\n", MAC_ARG(psta->hwaddr), psta->state);
+                       DBG_871X("asoc expire "MAC_FMT", state = 0x%x\n", MAC_ARG(psta->hwaddr), psta->state);
                        updated = ap_free_sta(padapter, psta, false, WLAN_REASON_DEAUTH_LEAVING);
                }
                else
@@ -349,7 +336,7 @@ void        expire_timeout_chk(_adapter *padapter)
                        /* TODO: Aging mechanism to digest frames in sleep_q to avoid running out of xmitframe */
                        if (psta->sleepq_len > (NR_XMITFRAME/pstapriv->asoc_list_cnt)
                                && padapter->xmitpriv.free_xmitframe_cnt < ((NR_XMITFRAME/pstapriv->asoc_list_cnt)/2)
-                       ){
+                       ) {
                                DBG_871X("%s sta:"MAC_FMT", sleepq_len:%u, free_xmitframe_cnt:%u, asoc_list_cnt:%u, clear sleep_q\n", __func__
                                        , MAC_ARG(psta->hwaddr)
                                        , psta->sleepq_len, padapter->xmitpriv.free_xmitframe_cnt, pstapriv->asoc_list_cnt);
@@ -362,7 +349,7 @@ void        expire_timeout_chk(_adapter *padapter)
 
 if (chk_alive_num) {
 
-       u8 backup_oper_channel=0;
+       u8 backup_oper_channel = 0;
        struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
        /* switch to correct channel of current network  before issue keep-alive frames */
        if (rtw_get_oper_ch(padapter) != pmlmeext->cur_channel) {
@@ -375,7 +362,7 @@ if (chk_alive_num) {
                int ret = _FAIL;
 
                psta = rtw_get_stainfo_by_offset(pstapriv, chk_alive_list[i]);
-               if(!(psta->state &_FW_LINKED))
+               if (!(psta->state &_FW_LINKED))
                        continue;
 
                if (psta->state & WIFI_SLEEP_STATE)
@@ -393,15 +380,15 @@ if (chk_alive_num) {
                }
                else if (psta->keep_alive_trycnt <= 3)
                {
-                       DBG_871X("ack check for asoc expire, keep_alive_trycnt=%d\n", psta->keep_alive_trycnt);
+                       DBG_871X("ack check for asoc expire, keep_alive_trycnt =%d\n", psta->keep_alive_trycnt);
                        psta->expire_to = 1;
                        continue;
                }
 
                psta->keep_alive_trycnt = 0;
-               DBG_871X("asoc expire "MAC_FMT", state=0x%x\n", MAC_ARG(psta->hwaddr), psta->state);
+               DBG_871X("asoc expire "MAC_FMT", state = 0x%x\n", MAC_ARG(psta->hwaddr), psta->state);
                spin_lock_bh(&pstapriv->asoc_list_lock);
-               if (list_empty(&psta->asoc_list)==false) {
+               if (list_empty(&psta->asoc_list) ==false) {
                        list_del_init(&psta->asoc_list);
                        pstapriv->asoc_list_cnt--;
                        updated = ap_free_sta(padapter, psta, false, WLAN_REASON_DEAUTH_LEAVING);
@@ -417,22 +404,17 @@ if (chk_alive_num) {
        associated_clients_update(padapter, updated);
 }
 
-void add_RATid(_adapter *padapter, struct sta_info *psta, u8 rssi_level)
+void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level)
 {
-       int i;
-       u8 rf_type;
        unsigned char sta_band = 0, shortGIrate = false;
-       unsigned int tx_ra_bitmap=0;
-       struct ht_priv  *psta_ht = NULL;
+       unsigned int tx_ra_bitmap = 0;
        struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-       WLAN_BSSID_EX *pcur_network = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network;
+       struct wlan_bssid_ex *pcur_network = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network;
 
-       if(psta)
-               psta_ht = &psta->htpriv;
-       else
+       if (!psta)
                return;
 
-       if(!(psta->state & _FW_LINKED))
+       if (!(psta->state & _FW_LINKED))
                return;
 
        rtw_hal_update_sta_rate_mask(padapter, psta);
@@ -440,7 +422,7 @@ void add_RATid(_adapter *padapter, struct sta_info *psta, u8 rssi_level)
 
        shortGIrate = query_ra_short_GI(psta);
 
-       if ( pcur_network->Configuration.DSConfig > 14 ) {
+       if (pcur_network->Configuration.DSConfig > 14) {
 
                if (tx_ra_bitmap & 0xffff000)
                        sta_band |= WIRELESS_11_5N ;
@@ -463,15 +445,15 @@ void add_RATid(_adapter *padapter, struct sta_info *psta, u8 rssi_level)
 
        if (psta->aid < NUM_STA)
        {
-               u8      arg[4] = {0};
+               u8 arg[4] = {0};
 
                arg[0] = psta->mac_id;
                arg[1] = psta->raid;
                arg[2] = shortGIrate;
                arg[3] = psta->init_rate;
 
-               DBG_871X("%s=> mac_id:%d , raid:%d , shortGIrate=%d, bitmap=0x%x\n",
-                       __FUNCTION__ , psta->mac_id, psta->raid ,shortGIrate, tx_ra_bitmap);
+               DBG_871X("%s => mac_id:%d , raid:%d , shortGIrate =%d, bitmap = 0x%x\n",
+                       __func__ , psta->mac_id, psta->raid , shortGIrate, tx_ra_bitmap);
 
                rtw_hal_add_ra_tid(padapter, tx_ra_bitmap, arg, rssi_level);
        }
@@ -482,23 +464,22 @@ void add_RATid(_adapter *padapter, struct sta_info *psta, u8 rssi_level)
 
 }
 
-void update_bmc_sta(_adapter *padapter)
+void update_bmc_sta(struct adapter *padapter)
 {
-       _irqL   irqL;
-       unsigned char   network_type;
+       unsigned char network_type;
        int supportRateNum = 0;
-       unsigned int tx_ra_bitmap=0;
+       unsigned int tx_ra_bitmap = 0;
        struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-       struct mlme_ext_priv    *pmlmeext = &(padapter->mlmeextpriv);
-       struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
-       WLAN_BSSID_EX *pcur_network = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network;
+       struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
+       struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
+       struct wlan_bssid_ex *pcur_network = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network;
        struct sta_info *psta = rtw_get_bcmc_stainfo(padapter);
 
-       if(psta)
+       if (psta)
        {
-               psta->aid = 0;//default set to 0
-               //psta->mac_id = psta->aid+4;
-               psta->mac_id = psta->aid + 1;//mac_id=1 for bc/mc stainfo
+               psta->aid = 0;/* default set to 0 */
+               /* psta->mac_id = psta->aid+4; */
+               psta->mac_id = psta->aid + 1;/* mac_id = 1 for bc/mc stainfo */
 
                pmlmeinfo->FW_sta_info[psta->mac_id].psta = psta;
 
@@ -509,16 +490,16 @@ void update_bmc_sta(_adapter *padapter)
 
                memset((void*)&psta->sta_stats, 0, sizeof(struct stainfo_stats));
 
-               //psta->dot118021XPrivacy = _NO_PRIVACY_;//!!! remove it, because it has been set before this.
+               /* psta->dot118021XPrivacy = _NO_PRIVACY_;//!!! remove it, because it has been set before this. */
 
-               //prepare for add_RATid
-               supportRateNum = rtw_get_rateset_len((u8*)&pcur_network->SupportedRates);
-               network_type = rtw_check_network_type((u8*)&pcur_network->SupportedRates, supportRateNum, pcur_network->Configuration.DSConfig);
+               /* prepare for add_RATid */
+               supportRateNum = rtw_get_rateset_len((u8 *)&pcur_network->SupportedRates);
+               network_type = rtw_check_network_type((u8 *)&pcur_network->SupportedRates, supportRateNum, pcur_network->Configuration.DSConfig);
                if (IsSupportedTxCCK(network_type)) {
                        network_type = WIRELESS_11B;
                }
-               else if (network_type == WIRELESS_INVALID) { // error handling
-                       if ( pcur_network->Configuration.DSConfig > 14 )
+               else if (network_type == WIRELESS_INVALID) { /*  error handling */
+                       if (pcur_network->Configuration.DSConfig > 14)
                                network_type = WIRELESS_11A;
                        else
                                network_type = WIRELESS_11B;
@@ -529,22 +510,22 @@ void update_bmc_sta(_adapter *padapter)
                rtw_hal_update_sta_rate_mask(padapter, psta);
                tx_ra_bitmap = psta->ra_mask;
 
-               psta->raid = rtw_hal_networktype_to_raid(padapter,psta);
+               psta->raid = rtw_hal_networktype_to_raid(padapter, psta);
 
-               //ap mode
+               /* ap mode */
                rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, true);
 
-               //if(pHalData->fw_ractrl == true)
+               /* if (pHalData->fw_ractrl == true) */
                {
-                       u8      arg[4] = {0};
+                       u8 arg[4] = {0};
 
                        arg[0] = psta->mac_id;
                        arg[1] = psta->raid;
                        arg[2] = 0;
                        arg[3] = psta->init_rate;
 
-                       DBG_871X("%s=> mac_id:%d , raid:%d , bitmap=0x%x\n",
-                               __FUNCTION__ , psta->mac_id, psta->raid , tx_ra_bitmap);
+                       DBG_871X("%s => mac_id:%d , raid:%d , bitmap = 0x%x\n",
+                               __func__ , psta->mac_id, psta->raid , tx_ra_bitmap);
 
                        rtw_hal_add_ra_tid(padapter, tx_ra_bitmap, arg, 0);
                }
@@ -563,55 +544,54 @@ void update_bmc_sta(_adapter *padapter)
 
 }
 
-//notes:
-//AID: 1~MAX for sta and 0 for bc/mc in ap/adhoc mode
-//MAC_ID = AID+1 for sta in ap/adhoc mode
-//MAC_ID = 1 for bc/mc for sta/ap/adhoc
-//MAC_ID = 0 for bssid for sta/ap/adhoc
-//CAM_ID = //0~3 for default key, cmd_id=macid + 3, macid=aid+1;
+/* notes: */
+/* AID: 1~MAX for sta and 0 for bc/mc in ap/adhoc mode */
+/* MAC_ID = AID+1 for sta in ap/adhoc mode */
+/* MAC_ID = 1 for bc/mc for sta/ap/adhoc */
+/* MAC_ID = 0 for bssid for sta/ap/adhoc */
+/* CAM_ID = 0~3 for default key, cmd_id =macid + 3, macid =aid+1; */
 
-void update_sta_info_apmode(_adapter *padapter, struct sta_info *psta)
+void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)
 {
-       _irqL   irqL;
        struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
        struct security_priv *psecuritypriv = &padapter->securitypriv;
-       struct mlme_ext_priv    *pmlmeext = &(padapter->mlmeextpriv);
-       struct ht_priv  *phtpriv_ap = &pmlmepriv->htpriv;
-       struct ht_priv  *phtpriv_sta = &psta->htpriv;
-       u8      cur_ldpc_cap=0, cur_stbc_cap=0, cur_beamform_cap=0;
-       //set intf_tag to if1
-       //psta->intf_tag = 0;
+       struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
+       struct ht_priv *phtpriv_ap = &pmlmepriv->htpriv;
+       struct ht_priv *phtpriv_sta = &psta->htpriv;
+       u8 cur_ldpc_cap = 0, cur_stbc_cap = 0, cur_beamform_cap = 0;
+       /* set intf_tag to if1 */
+       /* psta->intf_tag = 0; */
 
-        DBG_871X("%s\n",__FUNCTION__);
+        DBG_871X("%s\n", __func__);
 
-       //psta->mac_id = psta->aid+4;
-       //psta->mac_id = psta->aid+1;//alloc macid when call rtw_alloc_stainfo(),
-                                                      //release macid when call rtw_free_stainfo()
+       /* psta->mac_id = psta->aid+4; */
+       /* psta->mac_id = psta->aid+1;//alloc macid when call rtw_alloc_stainfo(), */
+                                                      /* release macid when call rtw_free_stainfo() */
 
-       //ap mode
-       rtw_hal_set_odm_var(padapter,HAL_ODM_STA_INFO,psta,true);
+       /* ap mode */
+       rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, true);
 
-       if(psecuritypriv->dot11AuthAlgrthm==dot11AuthAlgrthm_8021X)
+       if (psecuritypriv->dot11AuthAlgrthm ==dot11AuthAlgrthm_8021X)
                psta->ieee8021x_blocked = true;
        else
                psta->ieee8021x_blocked = false;
 
 
-       //update sta's cap
+       /* update sta's cap */
 
-       //ERP
+       /* ERP */
        VCS_update(padapter, psta);
 
-       //HT related cap
-       if(phtpriv_sta->ht_option)
+       /* HT related cap */
+       if (phtpriv_sta->ht_option)
        {
-               //check if sta supports rx ampdu
+               /* check if sta supports rx ampdu */
                phtpriv_sta->ampdu_enable = phtpriv_ap->ampdu_enable;
 
                phtpriv_sta->rx_ampdu_min_spacing = (phtpriv_sta->ht_cap.ampdu_params_info&IEEE80211_HT_CAP_AMPDU_DENSITY)>>2;
 
-               // bwmode
-               if((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info) & cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH))
+               /*  bwmode */
+               if ((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info) & cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH))
                {
                        psta->bw_mode = CHANNEL_WIDTH_40;
                }
@@ -620,7 +600,7 @@ void update_sta_info_apmode(_adapter *padapter, struct sta_info *psta)
                        psta->bw_mode = CHANNEL_WIDTH_20;
                }
 
-               if(pmlmeext->cur_bwmode < psta->bw_mode)
+               if (pmlmeext->cur_bwmode < psta->bw_mode)
                {
                        psta->bw_mode = pmlmeext->cur_bwmode;
                }
@@ -628,16 +608,16 @@ void update_sta_info_apmode(_adapter *padapter, struct sta_info *psta)
                phtpriv_sta->ch_offset = pmlmeext->cur_ch_offset;
 
 
-               //check if sta support s Short GI 20M
-               if((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info) & cpu_to_le16(IEEE80211_HT_CAP_SGI_20))
+               /* check if sta support s Short GI 20M */
+               if ((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info) & cpu_to_le16(IEEE80211_HT_CAP_SGI_20))
                {
                        phtpriv_sta->sgi_20m = true;
                }
 
-               //check if sta support s Short GI 40M
-               if((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info) & cpu_to_le16(IEEE80211_HT_CAP_SGI_40))
+               /* check if sta support s Short GI 40M */
+               if ((phtpriv_sta->ht_cap.cap_info & phtpriv_ap->ht_cap.cap_info) & cpu_to_le16(IEEE80211_HT_CAP_SGI_40))
                {
-                       if(psta->bw_mode == CHANNEL_WIDTH_40) //according to psta->bw_mode
+                       if (psta->bw_mode == CHANNEL_WIDTH_40) /* according to psta->bw_mode */
                                phtpriv_sta->sgi_40m = true;
                        else
                                phtpriv_sta->sgi_40m = false;
@@ -645,20 +625,20 @@ void update_sta_info_apmode(_adapter *padapter, struct sta_info *psta)
 
                psta->qos_option = true;
 
-               // B0 Config LDPC Coding Capability
+               /*  B0 Config LDPC Coding Capability */
                if (TEST_FLAG(phtpriv_ap->ldpc_cap, LDPC_HT_ENABLE_TX) &&
                        GET_HT_CAPABILITY_ELE_LDPC_CAP((u8 *)(&phtpriv_sta->ht_cap)))
                {
                        SET_FLAG(cur_ldpc_cap, (LDPC_HT_ENABLE_TX | LDPC_HT_CAP_TX));
-                       DBG_871X("Enable HT Tx LDPC for STA(%d)\n",psta->aid);
+                       DBG_871X("Enable HT Tx LDPC for STA(%d)\n", psta->aid);
                }
 
-               // B7 B8 B9 Config STBC setting
+               /*  B7 B8 B9 Config STBC setting */
                if (TEST_FLAG(phtpriv_ap->stbc_cap, STBC_HT_ENABLE_TX) &&
                        GET_HT_CAPABILITY_ELE_RX_STBC((u8 *)(&phtpriv_sta->ht_cap)))
                {
-                       SET_FLAG(cur_stbc_cap, (STBC_HT_ENABLE_TX | STBC_HT_CAP_TX) );
-                       DBG_871X("Enable HT Tx STBC for STA(%d)\n",psta->aid);
+                       SET_FLAG(cur_stbc_cap, (STBC_HT_ENABLE_TX | STBC_HT_CAP_TX));
+                       DBG_871X("Enable HT Tx STBC for STA(%d)\n", psta->aid);
                }
        }
        else
@@ -675,23 +655,23 @@ void update_sta_info_apmode(_adapter *padapter, struct sta_info *psta)
        phtpriv_sta->stbc_cap = cur_stbc_cap;
        phtpriv_sta->beamform_cap = cur_beamform_cap;
 
-       //Rx AMPDU
-       send_delba(padapter, 0, psta->hwaddr);// recipient
+       /* Rx AMPDU */
+       send_delba(padapter, 0, psta->hwaddr);/*  recipient */
 
-       //TX AMPDU
-       send_delba(padapter, 1, psta->hwaddr);// // originator
-       phtpriv_sta->agg_enable_bitmap = 0x0;//reset
-       phtpriv_sta->candidate_tid_bitmap = 0x0;//reset
+       /* TX AMPDU */
+       send_delba(padapter, 1, psta->hwaddr);/* originator */
+       phtpriv_sta->agg_enable_bitmap = 0x0;/* reset */
+       phtpriv_sta->candidate_tid_bitmap = 0x0;/* reset */
 
        update_ldpc_stbc_cap(psta);
 
-       //todo: init other variables
+       /* todo: init other variables */
 
        memset((void*)&psta->sta_stats, 0, sizeof(struct stainfo_stats));
 
 
-       //add ratid
-       //add_RATid(padapter, psta);//move to ap_sta_info_defer_update()
+       /* add ratid */
+       /* add_RATid(padapter, psta);//move to ap_sta_info_defer_update() */
 
 
        spin_lock_bh(&psta->lock);
@@ -701,32 +681,31 @@ void update_sta_info_apmode(_adapter *padapter, struct sta_info *psta)
 
 }
 
-static void update_ap_info(_adapter *padapter, struct sta_info *psta)
+static void update_ap_info(struct adapter *padapter, struct sta_info *psta)
 {
        struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-       WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network;
-       struct security_priv *psecuritypriv = &padapter->securitypriv;
-       struct mlme_ext_priv    *pmlmeext = &(padapter->mlmeextpriv);
-       struct ht_priv  *phtpriv_ap = &pmlmepriv->htpriv;
+       struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network;
+       struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
+       struct ht_priv *phtpriv_ap = &pmlmepriv->htpriv;
 
        psta->wireless_mode = pmlmeext->cur_wireless_mode;
 
        psta->bssratelen = rtw_get_rateset_len(pnetwork->SupportedRates);
        memcpy(psta->bssrateset, pnetwork->SupportedRates, psta->bssratelen);
 
-       //HT related cap
-       if(phtpriv_ap->ht_option)
+       /* HT related cap */
+       if (phtpriv_ap->ht_option)
        {
-               //check if sta supports rx ampdu
-               //phtpriv_ap->ampdu_enable = phtpriv_ap->ampdu_enable;
+               /* check if sta supports rx ampdu */
+               /* phtpriv_ap->ampdu_enable = phtpriv_ap->ampdu_enable; */
 
-               //check if sta support s Short GI 20M
-               if((phtpriv_ap->ht_cap.cap_info) & cpu_to_le16(IEEE80211_HT_CAP_SGI_20))
+               /* check if sta support s Short GI 20M */
+               if ((phtpriv_ap->ht_cap.cap_info) & cpu_to_le16(IEEE80211_HT_CAP_SGI_20))
                {
                        phtpriv_ap->sgi_20m = true;
                }
-               //check if sta support s Short GI 40M
-               if((phtpriv_ap->ht_cap.cap_info) & cpu_to_le16(IEEE80211_HT_CAP_SGI_40))
+               /* check if sta support s Short GI 40M */
+               if ((phtpriv_ap->ht_cap.cap_info) & cpu_to_le16(IEEE80211_HT_CAP_SGI_40))
                {
                        phtpriv_ap->sgi_40m = true;
                }
@@ -744,24 +723,23 @@ static void update_ap_info(_adapter *padapter, struct sta_info *psta)
        psta->bw_mode = pmlmeext->cur_bwmode;
        phtpriv_ap->ch_offset = pmlmeext->cur_ch_offset;
 
-       phtpriv_ap->agg_enable_bitmap = 0x0;//reset
-       phtpriv_ap->candidate_tid_bitmap = 0x0;//reset
+       phtpriv_ap->agg_enable_bitmap = 0x0;/* reset */
+       phtpriv_ap->candidate_tid_bitmap = 0x0;/* reset */
 
        memcpy(&psta->htpriv, &pmlmepriv->htpriv, sizeof(struct ht_priv));
 }
 
-static void update_hw_ht_param(_adapter *padapter)
+static void update_hw_ht_param(struct adapter *padapter)
 {
-       unsigned char           max_AMPDU_len;
-       unsigned char           min_MPDU_spacing;
-       struct registry_priv     *pregpriv = &padapter->registrypriv;
-       struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
-       struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
+       unsigned char   max_AMPDU_len;
+       unsigned char   min_MPDU_spacing;
+       struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
+       struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
 
-       DBG_871X("%s\n", __FUNCTION__);
+       DBG_871X("%s\n", __func__);
 
 
-       //handle A-MPDU parameter field
+       /* handle A-MPDU parameter field */
        /*
                AMPDU_para [1:0]:Max AMPDU Len => 0:8k , 1:16k, 2:32k, 3:64k
                AMPDU_para [4:2]:Min MPDU Start Spacing
@@ -774,47 +752,38 @@ static void update_hw_ht_param(_adapter *padapter)
 
        rtw_hal_set_hwreg(padapter, HW_VAR_AMPDU_FACTOR, (u8 *)(&max_AMPDU_len));
 
-       //
-       // 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_871X("%s(): WLAN_HT_CAP_SM_PS_STATIC\n",__FUNCTION__);
-       }
+       /*  */
+       /*  Config SM Power Save setting */
+       /*  */
+       pmlmeinfo->SM_PS = (le16_to_cpu(pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info) & 0x0C) >> 2;
+       if (pmlmeinfo->SM_PS == WLAN_HT_CAP_SM_PS_STATIC)
+               DBG_871X("%s(): WLAN_HT_CAP_SM_PS_STATIC\n", __func__);
 
-       //
-       // Config current HT Protection mode.
-       //
-       //pmlmeinfo->HT_protection = pmlmeinfo->HT_info.infos[1] & 0x3;
+       /*  */
+       /*  Config current HT Protection mode. */
+       /*  */
+       /* pmlmeinfo->HT_protection = pmlmeinfo->HT_info.infos[1] & 0x3; */
 
 }
 
-void start_bss_network(_adapter *padapter, u8 *pbuf)
+void start_bss_network(struct adapter *padapter, u8 *pbuf)
 {
        u8 *p;
        u8 val8, cur_channel, cur_bwmode, cur_ch_offset;
        u16 bcn_interval;
-       u32     acparm;
+       u32 acparm;
        int     ie_len;
-       struct registry_priv     *pregpriv = &padapter->registrypriv;
+       struct registry_priv  *pregpriv = &padapter->registrypriv;
        struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-       struct security_priv* psecuritypriv=&(padapter->securitypriv);
-       WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network;
-       struct mlme_ext_priv    *pmlmeext = &(padapter->mlmeextpriv);
-       struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
-       WLAN_BSSID_EX *pnetwork_mlmeext = &(pmlmeinfo->network);
-       struct HT_info_element *pht_info=NULL;
-       u8      cbw40_enable=0;
-       u8      change_band = false;
+       struct security_priv* psecuritypriv =&(padapter->securitypriv);
+       struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network;
+       struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
+       struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
+       struct wlan_bssid_ex *pnetwork_mlmeext = &(pmlmeinfo->network);
+       struct HT_info_element *pht_info = NULL;
+       u8 cbw40_enable = 0;
 
-       //DBG_871X("%s\n", __FUNCTION__);
+       /* DBG_871X("%s\n", __func__); */
 
        bcn_interval = (u16)pnetwork->Configuration.BeaconPeriod;
        cur_channel = pnetwork->Configuration.DSConfig;
@@ -822,83 +791,83 @@ void start_bss_network(_adapter *padapter, u8 *pbuf)
        cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
 
 
-       //check if there is wps ie,
-       //if there is wpsie in beacon, the hostapd will update beacon twice when stating hostapd,
-       //and at first time the security ie ( RSN/WPA IE) will not include in beacon.
-       if(NULL == rtw_get_wps_ie(pnetwork->IEs+_FIXED_IE_LENGTH_, pnetwork->IELength-_FIXED_IE_LENGTH_, NULL, NULL))
+       /* check if there is wps ie, */
+       /* if there is wpsie in beacon, the hostapd will update beacon twice when stating hostapd, */
+       /* and at first time the security ie (RSN/WPA IE) will not include in beacon. */
+       if (NULL == rtw_get_wps_ie(pnetwork->IEs+_FIXED_IE_LENGTH_, pnetwork->IELength-_FIXED_IE_LENGTH_, NULL, NULL))
        {
                pmlmeext->bstart_bss = true;
        }
 
-       //todo: update wmm, ht cap
-       //pmlmeinfo->WMM_enable;
-       //pmlmeinfo->HT_enable;
-       if(pmlmepriv->qospriv.qos_option)
+       /* todo: update wmm, ht cap */
+       /* pmlmeinfo->WMM_enable; */
+       /* pmlmeinfo->HT_enable; */
+       if (pmlmepriv->qospriv.qos_option)
                pmlmeinfo->WMM_enable = true;
-       if(pmlmepriv->htpriv.ht_option)
+       if (pmlmepriv->htpriv.ht_option)
        {
                pmlmeinfo->WMM_enable = true;
                pmlmeinfo->HT_enable = true;
-               //pmlmeinfo->HT_info_enable = true;
-               //pmlmeinfo->HT_caps_enable = true;
+               /* pmlmeinfo->HT_info_enable = true; */
+               /* pmlmeinfo->HT_caps_enable = true; */
 
                update_hw_ht_param(padapter);
        }
 
-       if(pmlmepriv->cur_network.join_res != true) //setting only at  first time
+       if (pmlmepriv->cur_network.join_res != true) /* setting only at  first time */
        {
-               //WEP Key will be set before this function, do not clear CAM.
+               /* WEP Key will be set before this function, do not clear CAM. */
                if ((psecuritypriv->dot11PrivacyAlgrthm != _WEP40_) && (psecuritypriv->dot11PrivacyAlgrthm != _WEP104_))
-                       flush_all_cam_entry(padapter);  //clear CAM
+                       flush_all_cam_entry(padapter);  /* clear CAM */
        }
 
-       //set MSR to AP_Mode
+       /* set MSR to AP_Mode */
        Set_MSR(padapter, _HW_STATE_AP_);
 
-       //Set BSSID REG
+       /* Set BSSID REG */
        rtw_hal_set_hwreg(padapter, HW_VAR_BSSID, pnetwork->MacAddress);
 
-       //Set EDCA param reg
-       acparm = 0x002F3217; // VO
+       /* Set EDCA param reg */
+       acparm = 0x002F3217; /*  VO */
        rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_VO, (u8 *)(&acparm));
-       acparm = 0x005E4317; // VI
+       acparm = 0x005E4317; /*  VI */
        rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_VI, (u8 *)(&acparm));
-       //acparm = 0x00105320; // BE
+       /* acparm = 0x00105320; // BE */
        acparm = 0x005ea42b;
        rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_BE, (u8 *)(&acparm));
-       acparm = 0x0000A444; // BK
+       acparm = 0x0000A444; /*  BK */
        rtw_hal_set_hwreg(padapter, HW_VAR_AC_PARAM_BK, (u8 *)(&acparm));
 
-       //Set Security
+       /* Set Security */
        val8 = (psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X)? 0xcc: 0xcf;
        rtw_hal_set_hwreg(padapter, HW_VAR_SEC_CFG, (u8 *)(&val8));
 
-       //Beacon Control related register
+       /* Beacon Control related register */
        rtw_hal_set_hwreg(padapter, HW_VAR_BEACON_INTERVAL, (u8 *)(&bcn_interval));
 
        rtw_hal_set_hwreg(padapter, HW_VAR_DO_IQK, NULL);
 
-       if(pmlmepriv->cur_network.join_res != true) //setting only at  first time
+       if (pmlmepriv->cur_network.join_res != true) /* setting only at  first time */
        {
-               //u32 initialgain;
+               /* u32 initialgain; */
 
-               //initialgain = 0x1e;
+               /* initialgain = 0x1e; */
 
 
-               //disable dynamic functions, such as high power, DIG
-               //Save_DM_Func_Flag(padapter);
-               //Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, false);
+               /* disable dynamic functions, such as high power, DIG */
+               /* Save_DM_Func_Flag(padapter); */
+               /* Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, false); */
 
-               //turn on all dynamic functions
+               /* turn on all dynamic functions */
                Switch_DM_Func(padapter, DYNAMIC_ALL_FUNC_ENABLE, true);
 
-               //rtw_hal_set_hwreg(padapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain));
+               /* rtw_hal_set_hwreg(padapter, HW_VAR_INITIAL_GAIN, (u8 *)(&initialgain)); */
 
        }
 
-       //set channel, bwmode
-       p = rtw_get_ie((pnetwork->IEs + sizeof(NDIS_802_11_FIXED_IEs)), _HT_ADD_INFO_IE_, &ie_len, (pnetwork->IELength - sizeof(NDIS_802_11_FIXED_IEs)));
-       ifp && ie_len)
+       /* set channel, bwmode */
+       p = rtw_get_ie((pnetwork->IEs + sizeof(struct ndis_802_11_fix_ie)), _HT_ADD_INFO_IE_, &ie_len, (pnetwork->IELength - sizeof(struct ndis_802_11_fix_ie)));
+       if (p && ie_len)
        {
                pht_info = (struct HT_info_element *)(p+2);
 
@@ -912,23 +881,23 @@ void start_bss_network(_adapter *padapter, u8 *pbuf)
 
                if ((cbw40_enable) &&    (pht_info->infos[0] & BIT(2)))
                {
-                       //switch to the 40M Hz mode
-                       //pmlmeext->cur_bwmode = CHANNEL_WIDTH_40;
+                       /* switch to the 40M Hz mode */
+                       /* pmlmeext->cur_bwmode = CHANNEL_WIDTH_40; */
                        cur_bwmode = CHANNEL_WIDTH_40;
                        switch (pht_info->infos[0] & 0x3)
                        {
                                case 1:
-                                       //pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_LOWER;
+                                       /* pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_LOWER; */
                                        cur_ch_offset = HAL_PRIME_CHNL_OFFSET_LOWER;
                                        break;
 
                                case 3:
-                                       //pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_UPPER;
+                                       /* pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_UPPER; */
                                        cur_ch_offset = HAL_PRIME_CHNL_OFFSET_UPPER;
                                        break;
 
                                default:
-                                       //pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
+                                       /* pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; */
                                        cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
                                        break;
                        }
@@ -938,70 +907,67 @@ void start_bss_network(_adapter *padapter, u8 *pbuf)
        }
 
        set_channel_bwmode(padapter, cur_channel, cur_ch_offset, cur_bwmode);
-       DBG_871X("CH=%d, BW=%d, offset=%d\n", cur_channel, cur_bwmode, cur_ch_offset);
+       DBG_871X("CH =%d, BW =%d, offset =%d\n", cur_channel, cur_bwmode, cur_ch_offset);
        pmlmeext->cur_channel = cur_channel;
        pmlmeext->cur_bwmode = cur_bwmode;
        pmlmeext->cur_ch_offset = cur_ch_offset;
        pmlmeext->cur_wireless_mode = pmlmepriv->cur_network.network_type;
 
-       //let pnetwork_mlmeext == pnetwork_mlme.
+       /* let pnetwork_mlmeext == pnetwork_mlme. */
        memcpy(pnetwork_mlmeext, pnetwork, pnetwork->Length);
 
-       //update cur_wireless_mode
+       /* update cur_wireless_mode */
        update_wireless_mode(padapter);
 
-       //update RRSR after set channel and bandwidth
+       /* update RRSR after set channel and bandwidth */
        UpdateBrateTbl(padapter, pnetwork->SupportedRates);
        rtw_hal_set_hwreg(padapter, HW_VAR_BASIC_RATE, pnetwork->SupportedRates);
 
-       //udpate capability after cur_wireless_mode updated
-       update_capinfo(padapter, rtw_get_capability((WLAN_BSSID_EX *)pnetwork));
+       /* udpate capability after cur_wireless_mode updated */
+       update_capinfo(padapter, rtw_get_capability((struct wlan_bssid_ex *)pnetwork));
 
 
-       if(true == pmlmeext->bstart_bss)
+       if (true == pmlmeext->bstart_bss)
        {
                update_beacon(padapter, _TIM_IE_, NULL, true);
 
-#ifndef CONFIG_INTERRUPT_BASED_TXBCN //other case will  tx beacon when bcn interrupt coming in.
-               //issue beacon frame
-               if(send_beacon(padapter)==_FAIL)
+#ifndef CONFIG_INTERRUPT_BASED_TXBCN /* other case will  tx beacon when bcn interrupt coming in. */
+               /* issue beacon frame */
+               if (send_beacon(padapter) == _FAIL)
                {
                        DBG_871X("issue_beacon, fail!\n");
                }
-#endif //!CONFIG_INTERRUPT_BASED_TXBCN
+#endif /* CONFIG_INTERRUPT_BASED_TXBCN */
 
        }
 
 
-       //update bc/mc sta_info
+       /* update bc/mc sta_info */
        update_bmc_sta(padapter);
 
-       //pmlmeext->bstart_bss = true;
+       /* pmlmeext->bstart_bss = true; */
 
 }
 
-int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf,  int len)
+int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf,  int len)
 {
-       int ret=_SUCCESS;
+       int ret = _SUCCESS;
        u8 *p;
-       u8 *pHT_caps_ie=NULL;
-       u8 *pHT_info_ie=NULL;
+       u8 *pHT_caps_ie = NULL;
+       u8 *pHT_info_ie = NULL;
        struct sta_info *psta = NULL;
-       u16 cap, ht_cap=false;
+       u16 cap, ht_cap =false;
        uint ie_len = 0;
        int group_cipher, pairwise_cipher;
-       u8      channel, network_type, supportRate[NDIS_802_11_LENGTH_RATES_EX];
+       u8 channel, network_type, supportRate[NDIS_802_11_LENGTH_RATES_EX];
        int supportRateNum = 0;
-       u8 OUI1[] = {0x00, 0x50, 0xf2,0x01};
-       u8 wps_oui[4]={0x0,0x50,0xf2,0x04};
+       u8 OUI1[] = {0x00, 0x50, 0xf2, 0x01};
        u8 WMM_PARA_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x01, 0x01};
        struct registry_priv *pregistrypriv = &padapter->registrypriv;
        struct security_priv *psecuritypriv = &padapter->securitypriv;
        struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-       WLAN_BSSID_EX *pbss_network = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network;
-       struct sta_priv *pstapriv = &padapter->stapriv;
+       struct wlan_bssid_ex *pbss_network = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network;
        u8 *ie = pbss_network->IEs;
-       u8 vht_cap=false;
 
        /* SSID */
        /* Supported rates */
@@ -1014,13 +980,13 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf,  int len)
        /* ht_capab, ht_oper */
        /* WPS IE */
 
-       DBG_871X("%s, len=%d\n", __FUNCTION__, len);
+       DBG_871X("%s, len =%d\n", __func__, len);
 
-       if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != true)
+       if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != true)
                return _FAIL;
 
 
-       if(len>MAX_IE_SZ)
+       if (len>MAX_IE_SZ)
                return _FAIL;
 
        pbss_network->IELength = len;
@@ -1030,44 +996,44 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf,  int len)
        memcpy(ie, pbuf, pbss_network->IELength);
 
 
-       if(pbss_network->InfrastructureMode!=Ndis802_11APMode)
+       if (pbss_network->InfrastructureMode!=Ndis802_11APMode)
                return _FAIL;
 
        pbss_network->Rssi = 0;
 
        memcpy(pbss_network->MacAddress, myid(&(padapter->eeprompriv)), ETH_ALEN);
 
-       //beacon interval
-       p = rtw_get_beacon_interval_from_ie(ie);//ie + 8;       // 8: TimeStamp, 2: Beacon Interval 2:Capability
-       //pbss_network->Configuration.BeaconPeriod = le16_to_cpu(*(unsigned short*)p);
+       /* beacon interval */
+       p = rtw_get_beacon_interval_from_ie(ie);/* ie + 8;      8: TimeStamp, 2: Beacon Interval 2:Capability */
+       /* pbss_network->Configuration.BeaconPeriod = le16_to_cpu(*(unsigned short*)p); */
        pbss_network->Configuration.BeaconPeriod = RTW_GET_LE16(p);
 
-       //capability
-       //cap = *(unsigned short *)rtw_get_capability_from_ie(ie);
-       //cap = le16_to_cpu(cap);
+       /* capability */
+       /* cap = *(unsigned short *)rtw_get_capability_from_ie(ie); */
+       /* cap = le16_to_cpu(cap); */
        cap = RTW_GET_LE16(ie);
 
-       //SSID
+       /* SSID */
        p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _SSID_IE_, &ie_len, (pbss_network->IELength -_BEACON_IE_OFFSET_));
-       if(p && ie_len>0)
+       if (p && ie_len>0)
        {
-               memset(&pbss_network->Ssid, 0, sizeof(NDIS_802_11_SSID));
+               memset(&pbss_network->Ssid, 0, sizeof(struct ndis_802_11_ssid));
                memcpy(pbss_network->Ssid.Ssid, (p + 2), ie_len);
                pbss_network->Ssid.SsidLength = ie_len;
        }
 
-       //chnnel
+       /* chnnel */
        channel = 0;
        pbss_network->Configuration.Length = 0;
        p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _DSSET_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_));
-       if(p && ie_len>0)
+       if (p && ie_len>0)
                channel = *(p + 2);
 
        pbss_network->Configuration.DSConfig = channel;
 
 
        memset(supportRate, 0, NDIS_802_11_LENGTH_RATES_EX);
-       // get supported rates
+       /*  get supported rates */
        p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_));
        if (p !=  NULL)
        {
@@ -1075,7 +1041,7 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf,  int len)
                supportRateNum = ie_len;
        }
 
-       //get ext_supported rates
+       /* get ext_supported rates */
        p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _EXT_SUPPORTEDRATES_IE_, &ie_len, pbss_network->IELength - _BEACON_IE_OFFSET_);
        if (p !=  NULL)
        {
@@ -1089,14 +1055,14 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf,  int len)
        rtw_set_supported_rate(pbss_network->SupportedRates, network_type);
 
 
-       //parsing ERP_IE
+       /* parsing ERP_IE */
        p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _ERPINFO_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_));
-       if(p && ie_len>0)
+       if (p && ie_len>0)
        {
-               ERP_IE_handler(padapter, (PNDIS_802_11_VARIABLE_IEs)p);
+               ERP_IE_handler(padapter, (struct ndis_80211_var_ie *)p);
        }
 
-       //update privacy/security
+       /* update privacy/security */
        if (cap & BIT(4))
                pbss_network->Privacy = 1;
        else
@@ -1104,18 +1070,18 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf,  int len)
 
        psecuritypriv->wpa_psk = 0;
 
-       //wpa2
+       /* wpa2 */
        group_cipher = 0; pairwise_cipher = 0;
        psecuritypriv->wpa2_group_cipher = _NO_PRIVACY_;
        psecuritypriv->wpa2_pairwise_cipher = _NO_PRIVACY_;
        p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _RSN_IE_2_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_));
-       if(p && ie_len>0)
+       if (p && ie_len>0)
        {
-               if(rtw_parse_wpa2_ie(p, ie_len+2, &group_cipher, &pairwise_cipher, NULL) == _SUCCESS)
+               if (rtw_parse_wpa2_ie(p, ie_len+2, &group_cipher, &pairwise_cipher, NULL) == _SUCCESS)
                {
-                       psecuritypriv->dot11AuthAlgrthm= dot11AuthAlgrthm_8021X;
+                       psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X;
 
-                       psecuritypriv->dot8021xalg = 1;//psk,  todo:802.1x
+                       psecuritypriv->dot8021xalg = 1;/* psk,  todo:802.1x */
                        psecuritypriv->wpa_psk |= BIT(1);
 
                        psecuritypriv->wpa2_group_cipher = group_cipher;
@@ -1124,7 +1090,7 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf,  int len)
 
        }
 
-       //wpa
+       /* wpa */
        ie_len = 0;
        group_cipher = 0; pairwise_cipher = 0;
        psecuritypriv->wpa_group_cipher = _NO_PRIVACY_;
@@ -1134,11 +1100,11 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf,  int len)
                p = rtw_get_ie(p, _SSN_IE_1_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_ - (ie_len + 2)));
                if ((p) && (!memcmp(p+2, OUI1, 4)))
                {
-                       if(rtw_parse_wpa_ie(p, ie_len+2, &group_cipher, &pairwise_cipher, NULL) == _SUCCESS)
+                       if (rtw_parse_wpa_ie(p, ie_len+2, &group_cipher, &pairwise_cipher, NULL) == _SUCCESS)
                        {
-                               psecuritypriv->dot11AuthAlgrthm= dot11AuthAlgrthm_8021X;
+                               psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X;
 
-                               psecuritypriv->dot8021xalg = 1;//psk,  todo:802.1x
+                               psecuritypriv->dot8021xalg = 1;/* psk,  todo:802.1x */
 
                                psecuritypriv->wpa_psk |= BIT(0);
 
@@ -1157,19 +1123,19 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf,  int len)
 
        }
 
-       //wmm
+       /* wmm */
        ie_len = 0;
        pmlmepriv->qospriv.qos_option = 0;
-       if(pregistrypriv->wmm_enable)
+       if (pregistrypriv->wmm_enable)
        {
                for (p = ie + _BEACON_IE_OFFSET_; ;p += (ie_len + 2))
                {
                        p = rtw_get_ie(p, _VENDOR_SPECIFIC_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_ - (ie_len + 2)));
-                       if((p) && !memcmp(p+2, WMM_PARA_IE, 6))
+                       if ((p) && !memcmp(p+2, WMM_PARA_IE, 6))
                        {
                                pmlmepriv->qospriv.qos_option = 1;
 
-                               *(p+8) |= BIT(7);//QoS Info, support U-APSD
+                               *(p+8) |= BIT(7);/* QoS Info, support U-APSD */
 
                                /* disable all ACM bits since the WMM admission control is not supported */
                                *(p + 10) &= ~BIT(4); /* BE */
@@ -1187,15 +1153,15 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf,  int len)
                }
        }
 
-       //parsing HT_CAP_IE
+       /* parsing HT_CAP_IE */
        p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _HT_CAPABILITY_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_));
-       if(p && ie_len>0)
+       if (p && ie_len>0)
        {
-               u8 rf_type=0;
-               u8 max_rx_ampdu_factor=0;
+               u8 rf_type = 0;
+               u8 max_rx_ampdu_factor = 0;
                struct rtw_ieee80211_ht_cap *pht_cap = (struct rtw_ieee80211_ht_cap *)(p+2);
 
-               pHT_caps_ie=p;
+               pHT_caps_ie =p;
 
                ht_cap = true;
                network_type |= WIRELESS_11_24N;
@@ -1203,29 +1169,29 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf,  int len)
                rtw_ht_use_default_setting(padapter);
 
                if (pmlmepriv->htpriv.sgi_20m == false)
-                       pht_cap->cap_info &= ~(IEEE80211_HT_CAP_SGI_20);
+                       pht_cap->cap_info &= cpu_to_le16(~(IEEE80211_HT_CAP_SGI_20));
 
                if (pmlmepriv->htpriv.sgi_40m == false)
-                       pht_cap->cap_info &= ~(IEEE80211_HT_CAP_SGI_40);
+                       pht_cap->cap_info &= cpu_to_le16(~(IEEE80211_HT_CAP_SGI_40));
 
                if (!TEST_FLAG(pmlmepriv->htpriv.ldpc_cap, LDPC_HT_ENABLE_RX))
                {
-                       pht_cap->cap_info &= ~(IEEE80211_HT_CAP_LDPC_CODING);
+                       pht_cap->cap_info &= cpu_to_le16(~(IEEE80211_HT_CAP_LDPC_CODING));
                }
 
                if (!TEST_FLAG(pmlmepriv->htpriv.stbc_cap, STBC_HT_ENABLE_TX))
                {
-                       pht_cap->cap_info &= ~(IEEE80211_HT_CAP_TX_STBC);
+                       pht_cap->cap_info &= cpu_to_le16(~(IEEE80211_HT_CAP_TX_STBC));
                }
 
                if (!TEST_FLAG(pmlmepriv->htpriv.stbc_cap, STBC_HT_ENABLE_RX))
                {
-                       pht_cap->cap_info &= ~(IEEE80211_HT_CAP_RX_STBC_3R);
+                       pht_cap->cap_info &= cpu_to_le16(~(IEEE80211_HT_CAP_RX_STBC_3R));
                }
 
                pht_cap->ampdu_params_info &= ~(IEEE80211_HT_CAP_AMPDU_FACTOR|IEEE80211_HT_CAP_AMPDU_DENSITY);
 
-               if((psecuritypriv->wpa_pairwise_cipher & WPA_CIPHER_CCMP) ||
+               if ((psecuritypriv->wpa_pairwise_cipher & WPA_CIPHER_CCMP) ||
                        (psecuritypriv->wpa2_pairwise_cipher & WPA_CIPHER_CCMP))
                {
                        pht_cap->ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY&(0x07<<2));
@@ -1236,10 +1202,10 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf,  int len)
                }
 
                rtw_hal_get_def_var(padapter, HW_VAR_MAX_RX_AMPDU_FACTOR, &max_rx_ampdu_factor);
-               pht_cap->ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_FACTOR & max_rx_ampdu_factor); //set  Max Rx AMPDU size  to 64K
+               pht_cap->ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_FACTOR & max_rx_ampdu_factor); /* set  Max Rx AMPDU size  to 64K */
 
                rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type));
-               if(rf_type == RF_1T1R)
+               if (rf_type == RF_1T1R)
                {
                        pht_cap->supp_mcs_set[0] = 0xff;
                        pht_cap->supp_mcs_set[1] = 0x0;
@@ -1249,14 +1215,14 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf,  int len)
 
        }
 
-       //parsing HT_INFO_IE
+       /* parsing HT_INFO_IE */
        p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _HT_ADD_INFO_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_));
-       if(p && ie_len>0)
+       if (p && ie_len>0)
        {
-               pHT_info_ie=p;
+               pHT_info_ie =p;
        }
 
-       switch(network_type)
+       switch (network_type)
        {
                case WIRELESS_11B:
                        pbss_network->NetworkTypeInUse = Ndis802_11DS;
@@ -1279,39 +1245,39 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf,  int len)
 
        pmlmepriv->htpriv.ht_option = false;
 
-       if(psecuritypriv->wpa2_pairwise_cipher&WPA_CIPHER_TKIP) ||
+       if ((psecuritypriv->wpa2_pairwise_cipher&WPA_CIPHER_TKIP) ||
                      (psecuritypriv->wpa_pairwise_cipher&WPA_CIPHER_TKIP))
        {
-               //todo:
-               //ht_cap = false;
+               /* todo: */
+               /* ht_cap = false; */
        }
 
-       //ht_cap
-       if(pregistrypriv->ht_enable && ht_cap==true)
+       /* ht_cap */
+       if (pregistrypriv->ht_enable && ht_cap ==true)
        {
                pmlmepriv->htpriv.ht_option = true;
                pmlmepriv->qospriv.qos_option = 1;
 
-               if(pregistrypriv->ampdu_enable==1)
+               if (pregistrypriv->ampdu_enable == 1)
                {
                        pmlmepriv->htpriv.ampdu_enable = true;
                }
 
-               HT_caps_handler(padapter, (PNDIS_802_11_VARIABLE_IEs)pHT_caps_ie);
+               HT_caps_handler(padapter, (struct ndis_80211_var_ie *)pHT_caps_ie);
 
-               HT_info_handler(padapter, (PNDIS_802_11_VARIABLE_IEs)pHT_info_ie);
+               HT_info_handler(padapter, (struct ndis_80211_var_ie *)pHT_info_ie);
        }
 
-       pbss_network->Length = get_WLAN_BSSID_EX_sz((WLAN_BSSID_EX  *)pbss_network);
+       pbss_network->Length = get_wlan_bssid_ex_sz((struct wlan_bssid_ex  *)pbss_network);
 
-       //issue beacon to start bss network
-       //start_bss_network(padapter, (u8*)pbss_network);
+       /* issue beacon to start bss network */
+       /* start_bss_network(padapter, (u8 *)pbss_network); */
        rtw_startbss_cmd(padapter, RTW_CMDF_WAIT_ACK);
 
 
-       //alloc sta_info for ap itself
+       /* alloc sta_info for ap itself */
        psta = rtw_get_stainfo(&padapter->stapriv, pbss_network->MacAddress);
-       if(!psta)
+       if (!psta)
        {
                psta = rtw_alloc_stainfo(&padapter->stapriv, pbss_network->MacAddress);
                if (psta == NULL)
@@ -1320,45 +1286,44 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf,  int len)
                }
        }
 
-       // update AP's sta info
+       /*  update AP's sta info */
        update_ap_info(padapter, psta);
 
-       psta->state |= WIFI_AP_STATE;           //Aries, add,fix bug of flush_cam_entry at STOP AP mode , 0724
-       rtw_indicate_connect( padapter);
+       psta->state |= WIFI_AP_STATE;           /* Aries, add, fix bug of flush_cam_entry at STOP AP mode , 0724 */
+       rtw_indicate_connect(padapter);
 
-       pmlmepriv->cur_network.join_res = true;//for check if already set beacon
+       pmlmepriv->cur_network.join_res = true;/* for check if already set beacon */
 
-       //update bc/mc sta_info
-       //update_bmc_sta(padapter);
+       /* update bc/mc sta_info */
+       /* update_bmc_sta(padapter); */
 
        return ret;
 
 }
 
-void rtw_set_macaddr_acl(_adapter *padapter, int mode)
+void rtw_set_macaddr_acl(struct adapter *padapter, int mode)
 {
        struct sta_priv *pstapriv = &padapter->stapriv;
        struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
 
-       DBG_871X("%s, mode=%d\n", __func__, mode);
+       DBG_871X("%s, mode =%d\n", __func__, mode);
 
        pacl_list->mode = mode;
 }
 
-int rtw_acl_add_sta(_adapter *padapter, u8 *addr)
+int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)
 {
-       _irqL irqL;
-       _list   *plist, *phead;
+       struct list_head        *plist, *phead;
        u8 added = false;
-       int i, ret=0;
+       int i, ret = 0;
        struct rtw_wlan_acl_node *paclnode;
        struct sta_priv *pstapriv = &padapter->stapriv;
        struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
-       _queue  *pacl_node_q =&pacl_list->acl_node_q;
+       struct __queue  *pacl_node_q =&pacl_list->acl_node_q;
 
-       DBG_871X("%s(acl_num=%d)=" MAC_FMT "\n", __func__, pacl_list->num, MAC_ARG(addr));
+       DBG_871X("%s(acl_num =%d) =" MAC_FMT "\n", __func__, pacl_list->num, MAC_ARG(addr));
 
-       if((NUM_ACL-1) < pacl_list->num)
+       if ((NUM_ACL-1) < pacl_list->num)
                return (-1);
 
 
@@ -1372,9 +1337,9 @@ int rtw_acl_add_sta(_adapter *padapter, u8 *addr)
                paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list);
                plist = get_next(plist);
 
-               if(!memcmp(paclnode->addr, addr, ETH_ALEN))
+               if (!memcmp(paclnode->addr, addr, ETH_ALEN))
                {
-                       if(paclnode->valid == true)
+                       if (paclnode->valid == true)
                        {
                                added = true;
                                DBG_871X("%s, sta has been added\n", __func__);
@@ -1386,17 +1351,17 @@ int rtw_acl_add_sta(_adapter *padapter, u8 *addr)
        spin_unlock_bh(&(pacl_node_q->lock));
 
 
-       if(added == true)
+       if (added == true)
                return ret;
 
 
        spin_lock_bh(&(pacl_node_q->lock));
 
-       for(i=0; i< NUM_ACL; i++)
+       for (i = 0; i< NUM_ACL; i++)
        {
                paclnode = &pacl_list->aclnode[i];
 
-               if(paclnode->valid == false)
+               if (paclnode->valid == false)
                {
                        INIT_LIST_HEAD(&paclnode->list);
 
@@ -1412,25 +1377,24 @@ int rtw_acl_add_sta(_adapter *padapter, u8 *addr)
                }
        }
 
-       DBG_871X("%s, acl_num=%d\n", __func__, pacl_list->num);
+       DBG_871X("%s, acl_num =%d\n", __func__, pacl_list->num);
 
        spin_unlock_bh(&(pacl_node_q->lock));
 
        return ret;
 }
 
-int rtw_acl_remove_sta(_adapter *padapter, u8 *addr)
+int rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)
 {
-       _irqL irqL;
-       _list   *plist, *phead;
-       int i, ret=0;
+       struct list_head        *plist, *phead;
+       int ret = 0;
        struct rtw_wlan_acl_node *paclnode;
        struct sta_priv *pstapriv = &padapter->stapriv;
        struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
-       _queue  *pacl_node_q =&pacl_list->acl_node_q;
-       u8 baddr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };    //Baddr is used for clearing acl_list
+       struct __queue  *pacl_node_q =&pacl_list->acl_node_q;
+       u8 baddr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };    /* Baddr is used for clearing acl_list */
 
-       DBG_871X("%s(acl_num=%d)=" MAC_FMT "\n", __func__, pacl_list->num, MAC_ARG(addr));
+       DBG_871X("%s(acl_num =%d) =" MAC_FMT "\n", __func__, pacl_list->num, MAC_ARG(addr));
 
        spin_lock_bh(&(pacl_node_q->lock));
 
@@ -1442,9 +1406,9 @@ int rtw_acl_remove_sta(_adapter *padapter, u8 *addr)
                paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list);
                plist = get_next(plist);
 
-               if(!memcmp(paclnode->addr, addr, ETH_ALEN) || !memcmp(baddr, addr, ETH_ALEN))
+               if (!memcmp(paclnode->addr, addr, ETH_ALEN) || !memcmp(baddr, addr, ETH_ALEN))
                {
-                       if(paclnode->valid == true)
+                       if (paclnode->valid == true)
                        {
                                paclnode->valid = false;
 
@@ -1457,29 +1421,29 @@ int rtw_acl_remove_sta(_adapter *padapter, u8 *addr)
 
        spin_unlock_bh(&(pacl_node_q->lock));
 
-       DBG_871X("%s, acl_num=%d\n", __func__, pacl_list->num);
+       DBG_871X("%s, acl_num =%d\n", __func__, pacl_list->num);
 
        return ret;
 
 }
 
-u8 rtw_ap_set_pairwise_key(_adapter *padapter, struct sta_info *psta)
+u8 rtw_ap_set_pairwise_key(struct adapter *padapter, struct sta_info *psta)
 {
-       struct cmd_obj*                 ph2c;
+       struct cmd_obj*         ph2c;
        struct set_stakey_parm  *psetstakey_para;
-       struct cmd_priv                         *pcmdpriv=&padapter->cmdpriv;
-       u8      res=_SUCCESS;
+       struct cmd_priv                         *pcmdpriv =&padapter->cmdpriv;
+       u8 res = _SUCCESS;
 
        ph2c = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
-       if ( ph2c == NULL){
-               res= _FAIL;
+       if (ph2c == NULL) {
+               res = _FAIL;
                goto exit;
        }
 
        psetstakey_para = (struct set_stakey_parm*)rtw_zmalloc(sizeof(struct set_stakey_parm));
-       if(psetstakey_para==NULL){
+       if (psetstakey_para == NULL) {
                kfree((u8 *) ph2c);
-               res=_FAIL;
+               res = _FAIL;
                goto exit;
        }
 
@@ -1501,31 +1465,31 @@ exit:
 
 }
 
-static int rtw_ap_set_key(_adapter *padapter, u8 *key, u8 alg, int keyid, u8 set_tx)
+static int rtw_ap_set_key(struct adapter *padapter, u8 *key, u8 alg, int keyid, u8 set_tx)
 {
        u8 keylen;
        struct cmd_obj* pcmd;
        struct setkey_parm *psetkeyparm;
-       struct cmd_priv *pcmdpriv=&(padapter->cmdpriv);
-       int res=_SUCCESS;
+       struct cmd_priv *pcmdpriv =&(padapter->cmdpriv);
+       int res = _SUCCESS;
 
-       //DBG_871X("%s\n", __FUNCTION__);
+       /* DBG_871X("%s\n", __func__); */
 
        pcmd = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj));
-       if(pcmd==NULL){
-               res= _FAIL;
+       if (pcmd == NULL) {
+               res = _FAIL;
                goto exit;
        }
-       psetkeyparm=(struct setkey_parm*)rtw_zmalloc(sizeof(struct setkey_parm));
-       if(psetkeyparm==NULL){
+       psetkeyparm =(struct setkey_parm*)rtw_zmalloc(sizeof(struct setkey_parm));
+       if (psetkeyparm == NULL) {
                kfree((unsigned char *)pcmd);
-               res= _FAIL;
+               res = _FAIL;
                goto exit;
        }
 
        memset(psetkeyparm, 0, sizeof(struct setkey_parm));
 
-       psetkeyparm->keyid=(u8)keyid;
+       psetkeyparm->keyid =(u8)keyid;
        if (is_wep_enc(alg))
                padapter->securitypriv.key_mask |= BIT(psetkeyparm->keyid);
 
@@ -1533,7 +1497,7 @@ static int rtw_ap_set_key(_adapter *padapter, u8 *key, u8 alg, int keyid, u8 set
 
        psetkeyparm->set_tx = set_tx;
 
-       switch(alg)
+       switch (alg)
        {
                case _WEP40_:
                        keylen = 5;
@@ -1566,66 +1530,66 @@ exit:
        return res;
 }
 
-int rtw_ap_set_group_key(_adapter *padapter, u8 *key, u8 alg, int keyid)
+int rtw_ap_set_group_key(struct adapter *padapter, u8 *key, u8 alg, int keyid)
 {
-       DBG_871X("%s\n", __FUNCTION__);
+       DBG_871X("%s\n", __func__);
 
        return rtw_ap_set_key(padapter, key, alg, keyid, 1);
 }
 
-int rtw_ap_set_wep_key(_adapter *padapter, u8 *key, u8 keylen, int keyid, u8 set_tx)
+int rtw_ap_set_wep_key(struct adapter *padapter, u8 *key, u8 keylen, int keyid, u8 set_tx)
 {
        u8 alg;
 
-       switch(keylen)
+       switch (keylen)
        {
                case 5:
-                       alg =_WEP40_;
+                       alg = _WEP40_;
                        break;
                case 13:
-                       alg =_WEP104_;
+                       alg = _WEP104_;
                        break;
                default:
-                       alg =_NO_PRIVACY_;
+                       alg = _NO_PRIVACY_;
        }
 
-       DBG_871X("%s\n", __FUNCTION__);
+       DBG_871X("%s\n", __func__);
 
        return rtw_ap_set_key(padapter, key, alg, keyid, set_tx);
 }
 
-static void update_bcn_fixed_ie(_adapter *padapter)
+static void update_bcn_fixed_ie(struct adapter *padapter)
 {
-       DBG_871X("%s\n", __FUNCTION__);
+       DBG_871X("%s\n", __func__);
 
 }
 
-static void update_bcn_erpinfo_ie(_adapter *padapter)
+static void update_bcn_erpinfo_ie(struct adapter *padapter)
 {
        struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-       struct mlme_ext_priv    *pmlmeext = &(padapter->mlmeextpriv);
-       struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
-       WLAN_BSSID_EX *pnetwork = &(pmlmeinfo->network);
+       struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
+       struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
+       struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);
        unsigned char *p, *ie = pnetwork->IEs;
        u32 len = 0;
 
-       DBG_871X("%s, ERP_enable=%d\n", __FUNCTION__, pmlmeinfo->ERP_enable);
+       DBG_871X("%s, ERP_enable =%d\n", __func__, pmlmeinfo->ERP_enable);
 
-       if(!pmlmeinfo->ERP_enable)
+       if (!pmlmeinfo->ERP_enable)
                return;
 
-       //parsing ERP_IE
+       /* parsing ERP_IE */
        p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _ERPINFO_IE_, &len, (pnetwork->IELength - _BEACON_IE_OFFSET_));
-       if(p && len>0)
+       if (p && len>0)
        {
-               PNDIS_802_11_VARIABLE_IEs pIE = (PNDIS_802_11_VARIABLE_IEs)p;
+               struct ndis_80211_var_ie * pIE = (struct ndis_80211_var_ie *)p;
 
                if (pmlmepriv->num_sta_non_erp == 1)
                        pIE->data[0] |= RTW_ERP_INFO_NON_ERP_PRESENT|RTW_ERP_INFO_USE_PROTECTION;
                else
                        pIE->data[0] &= ~(RTW_ERP_INFO_NON_ERP_PRESENT|RTW_ERP_INFO_USE_PROTECTION);
 
-               if(pmlmepriv->num_sta_no_short_preamble > 0)
+               if (pmlmepriv->num_sta_no_short_preamble > 0)
                        pIE->data[0] |= RTW_ERP_INFO_BARKER_PREAMBLE_MODE;
                else
                        pIE->data[0] &= ~(RTW_ERP_INFO_BARKER_PREAMBLE_MODE);
@@ -1635,57 +1599,57 @@ static void update_bcn_erpinfo_ie(_adapter *padapter)
 
 }
 
-static void update_bcn_htcap_ie(_adapter *padapter)
+static void update_bcn_htcap_ie(struct adapter *padapter)
 {
-       DBG_871X("%s\n", __FUNCTION__);
+       DBG_871X("%s\n", __func__);
 
 }
 
-static void update_bcn_htinfo_ie(_adapter *padapter)
+static void update_bcn_htinfo_ie(struct adapter *padapter)
 {
-       DBG_871X("%s\n", __FUNCTION__);
+       DBG_871X("%s\n", __func__);
 
 }
 
-static void update_bcn_rsn_ie(_adapter *padapter)
+static void update_bcn_rsn_ie(struct adapter *padapter)
 {
-       DBG_871X("%s\n", __FUNCTION__);
+       DBG_871X("%s\n", __func__);
 
 }
 
-static void update_bcn_wpa_ie(_adapter *padapter)
+static void update_bcn_wpa_ie(struct adapter *padapter)
 {
-       DBG_871X("%s\n", __FUNCTION__);
+       DBG_871X("%s\n", __func__);
 
 }
 
-static void update_bcn_wmm_ie(_adapter *padapter)
+static void update_bcn_wmm_ie(struct adapter *padapter)
 {
-       DBG_871X("%s\n", __FUNCTION__);
+       DBG_871X("%s\n", __func__);
 
 }
 
-static void update_bcn_wps_ie(_adapter *padapter)
+static void update_bcn_wps_ie(struct adapter *padapter)
 {
-       u8 *pwps_ie=NULL, *pwps_ie_src, *premainder_ie, *pbackup_remainder_ie=NULL;
-       uint wps_ielen=0, wps_offset, remainder_ielen;
+       u8 *pwps_ie = NULL, *pwps_ie_src, *premainder_ie, *pbackup_remainder_ie = NULL;
+       uint wps_ielen = 0, wps_offset, remainder_ielen;
        struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-       struct mlme_ext_priv    *pmlmeext = &(padapter->mlmeextpriv);
-       struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
-       WLAN_BSSID_EX *pnetwork = &(pmlmeinfo->network);
+       struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
+       struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
+       struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);
        unsigned char *ie = pnetwork->IEs;
        u32 ielen = pnetwork->IELength;
 
 
-       DBG_871X("%s\n", __FUNCTION__);
+       DBG_871X("%s\n", __func__);
 
        pwps_ie = rtw_get_wps_ie(ie+_FIXED_IE_LENGTH_, ielen-_FIXED_IE_LENGTH_, NULL, &wps_ielen);
 
-       if(pwps_ie==NULL || wps_ielen==0)
+       if (pwps_ie == NULL || wps_ielen == 0)
                return;
 
        pwps_ie_src = pmlmepriv->wps_beacon_ie;
-       if(pwps_ie_src == NULL)
+       if (pwps_ie_src == NULL)
                return;
 
        wps_offset = (uint)(pwps_ie-ie);
@@ -1694,37 +1658,37 @@ static void update_bcn_wps_ie(_adapter *padapter)
 
        remainder_ielen = ielen - wps_offset - wps_ielen;
 
-       if(remainder_ielen>0)
+       if (remainder_ielen>0)
        {
                pbackup_remainder_ie = rtw_malloc(remainder_ielen);
-               if(pbackup_remainder_ie)
+               if (pbackup_remainder_ie)
                        memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen);
        }
 
-       wps_ielen = (uint)pwps_ie_src[1];//to get ie data len
-       if((wps_offset+wps_ielen+2+remainder_ielen)<=MAX_IE_SZ)
+       wps_ielen = (uint)pwps_ie_src[1];/* to get ie data len */
+       if ((wps_offset+wps_ielen+2+remainder_ielen)<=MAX_IE_SZ)
        {
                memcpy(pwps_ie, pwps_ie_src, wps_ielen+2);
                pwps_ie += (wps_ielen+2);
 
-               if(pbackup_remainder_ie)
+               if (pbackup_remainder_ie)
                        memcpy(pwps_ie, pbackup_remainder_ie, remainder_ielen);
 
-               //update IELength
+               /* update IELength */
                pnetwork->IELength = wps_offset + (wps_ielen+2) + remainder_ielen;
        }
 
-       if(pbackup_remainder_ie)
+       if (pbackup_remainder_ie)
                kfree(pbackup_remainder_ie);
 
-       // deal with the case without set_tx_beacon_cmd() in update_beacon()
-#if defined( CONFIG_INTERRUPT_BASED_TXBCN )
-       if(pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)
+       /*  deal with the case without set_tx_beacon_cmd() in update_beacon() */
+#if defined(CONFIG_INTERRUPT_BASED_TXBCN)
+       if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)
        {
                u8 sr = 0;
-               rtw_get_wps_attr_content(pwps_ie_src,  wps_ielen, WPS_ATTR_SELECTED_REGISTRAR, (u8*)(&sr), NULL);
+               rtw_get_wps_attr_content(pwps_ie_src,  wps_ielen, WPS_ATTR_SELECTED_REGISTRAR, (u8 *)(&sr), NULL);
 
-               if( sr ) {
+               if (sr) {
                        set_fwstate(pmlmepriv, WIFI_UNDER_WPS);
                        DBG_871X("%s, set WIFI_UNDER_WPS\n", __func__);
                }
@@ -1732,28 +1696,28 @@ static void update_bcn_wps_ie(_adapter *padapter)
 #endif
 }
 
-static void update_bcn_p2p_ie(_adapter *padapter)
+static void update_bcn_p2p_ie(struct adapter *padapter)
 {
 
 }
 
-static void update_bcn_vendor_spec_ie(_adapter *padapter, u8*oui)
+static void update_bcn_vendor_spec_ie(struct adapter *padapter, u8*oui)
 {
-       DBG_871X("%s\n", __FUNCTION__);
+       DBG_871X("%s\n", __func__);
 
-       if(!memcmp(RTW_WPA_OUI, oui, 4))
+       if (!memcmp(RTW_WPA_OUI, oui, 4))
        {
                update_bcn_wpa_ie(padapter);
        }
-       else if(!memcmp(WMM_OUI, oui, 4))
+       else if (!memcmp(WMM_OUI, oui, 4))
        {
                update_bcn_wmm_ie(padapter);
        }
-       else if(!memcmp(WPS_OUI, oui, 4))
+       else if (!memcmp(WPS_OUI, oui, 4))
        {
                update_bcn_wps_ie(padapter);
        }
-       else if(!memcmp(P2P_OUI, oui, 4))
+       else if (!memcmp(P2P_OUI, oui, 4))
        {
                update_bcn_p2p_ie(padapter);
        }
@@ -1765,32 +1729,31 @@ static void update_bcn_vendor_spec_ie(_adapter *padapter, u8*oui)
 
 }
 
-void update_beacon(_adapter *padapter, u8 ie_id, u8 *oui, u8 tx)
+void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx)
 {
-       _irqL irqL;
        struct mlme_priv *pmlmepriv;
-       struct mlme_ext_priv    *pmlmeext;
-       //struct mlme_ext_info  *pmlmeinfo;
+       struct mlme_ext_priv *pmlmeext;
+       /* struct mlme_ext_info *pmlmeinfo; */
 
-       //DBG_871X("%s\n", __FUNCTION__);
+       /* DBG_871X("%s\n", __func__); */
 
-       if(!padapter)
+       if (!padapter)
                return;
 
        pmlmepriv = &(padapter->mlmepriv);
        pmlmeext = &(padapter->mlmeextpriv);
-       //pmlmeinfo = &(pmlmeext->mlmext_info);
+       /* pmlmeinfo = &(pmlmeext->mlmext_info); */
 
-       if(false == pmlmeext->bstart_bss)
+       if (false == pmlmeext->bstart_bss)
                return;
 
        spin_lock_bh(&pmlmepriv->bcn_update_lock);
 
-       switch(ie_id)
+       switch (ie_id)
        {
                case 0xFF:
 
-                       update_bcn_fixed_ie(padapter);//8: TimeStamp, 2: Beacon Interval 2:Capability
+                       update_bcn_fixed_ie(padapter);/* 8: TimeStamp, 2: Beacon Interval 2:Capability */
 
                        break;
 
@@ -1839,12 +1802,12 @@ void update_beacon(_adapter *padapter, u8 ie_id, u8 *oui, u8 tx)
        spin_unlock_bh(&pmlmepriv->bcn_update_lock);
 
 #ifndef CONFIG_INTERRUPT_BASED_TXBCN
-       if(tx)
+       if (tx)
        {
-               //send_beacon(padapter);//send_beacon must execute on TSR level
+               /* send_beacon(padapter);//send_beacon must execute on TSR level */
                set_tx_beacon_cmd(padapter);
        }
-#endif //!CONFIG_INTERRUPT_BASED_TXBCN
+#endif /* CONFIG_INTERRUPT_BASED_TXBCN */
 
 }
 
@@ -1860,21 +1823,21 @@ Set to 2 if only HT STAs are associated in BSS,
 Set to 3 (HT mixed mode) when one or more non-HT STAs are associated
        (currently non-GF HT station is considered as non-HT STA also)
 */
-static int rtw_ht_operation_update(_adapter *padapter)
+static int rtw_ht_operation_update(struct adapter *padapter)
 {
        u16 cur_op_mode, new_op_mode;
        int op_mode_changes = 0;
        struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-       struct ht_priv  *phtpriv_ap = &pmlmepriv->htpriv;
+       struct ht_priv *phtpriv_ap = &pmlmepriv->htpriv;
 
-       if(pmlmepriv->htpriv.ht_option == true)
+       if (pmlmepriv->htpriv.ht_option == true)
                return 0;
 
-       //if (!iface->conf->ieee80211n || iface->conf->ht_op_mode_fixed)
-       //      return 0;
+       /* if (!iface->conf->ieee80211n || iface->conf->ht_op_mode_fixed) */
+       /*      return 0; */
 
-       DBG_871X("%s current operation mode=0x%X\n",
-                  __FUNCTION__, pmlmepriv->ht_op_mode);
+       DBG_871X("%s current operation mode = 0x%X\n",
+                  __func__, pmlmepriv->ht_op_mode);
 
        if (!(pmlmepriv->ht_op_mode & HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT)
            && pmlmepriv->num_sta_ht_no_gf) {
@@ -1909,7 +1872,7 @@ static int rtw_ht_operation_update(_adapter *padapter)
        if (pmlmepriv->num_sta_no_ht ||
            (pmlmepriv->ht_op_mode & HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT))
                new_op_mode = OP_MODE_MIXED;
-       else if ((phtpriv_ap->ht_cap.cap_info & IEEE80211_HT_CAP_SUP_WIDTH)
+       else if ((le16_to_cpu(phtpriv_ap->ht_cap.cap_info) & IEEE80211_HT_CAP_SUP_WIDTH)
                 && pmlmepriv->num_sta_ht_20mhz)
                new_op_mode = OP_MODE_20MHZ_HT_STA_ASSOCED;
        else if (pmlmepriv->olbc_ht)
@@ -1924,21 +1887,20 @@ static int rtw_ht_operation_update(_adapter *padapter)
                op_mode_changes++;
        }
 
-       DBG_871X("%s new operation mode=0x%X changes=%d\n",
-                  __FUNCTION__, pmlmepriv->ht_op_mode, op_mode_changes);
+       DBG_871X("%s new operation mode = 0x%X changes =%d\n",
+                  __func__, pmlmepriv->ht_op_mode, op_mode_changes);
 
        return op_mode_changes;
 
 }
 
-void associated_clients_update(_adapter *padapter, u8 updated)
+void associated_clients_update(struct adapter *padapter, u8 updated)
 {
-       //update associcated stations cap.
-       if(updated == true)
+       /* update associcated stations cap. */
+       if (updated == true)
        {
-               _irqL irqL;
-               _list   *phead, *plist;
-               struct sta_info *psta=NULL;
+               struct list_head        *phead, *plist;
+               struct sta_info *psta = NULL;
                struct sta_priv *pstapriv = &padapter->stapriv;
 
                spin_lock_bh(&pstapriv->asoc_list_lock);
@@ -1946,7 +1908,7 @@ void associated_clients_update(_adapter *padapter, u8 updated)
                phead = &pstapriv->asoc_list;
                plist = get_next(phead);
 
-               //check asoc_queue
+               /* check asoc_queue */
                while (phead != plist)
                {
                        psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list);
@@ -1963,15 +1925,15 @@ void associated_clients_update(_adapter *padapter, u8 updated)
 }
 
 /* called > TSR LEVEL for USB or SDIO Interface*/
-void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
+void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)
 {
        u8 beacon_updated = false;
        struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
        struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
 
-        if(!(psta->flags & WLAN_STA_SHORT_PREAMBLE))
+        if (!(psta->flags & WLAN_STA_SHORT_PREAMBLE))
        {
-               if(!psta->no_short_preamble_set)
+               if (!psta->no_short_preamble_set)
                {
                        psta->no_short_preamble_set = 1;
 
@@ -1988,7 +1950,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
        }
        else
        {
-               if(psta->no_short_preamble_set)
+               if (psta->no_short_preamble_set)
                {
                        psta->no_short_preamble_set = 0;
 
@@ -2004,9 +1966,9 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
                }
        }
 
-       if(psta->flags & WLAN_STA_NONERP)
+       if (psta->flags & WLAN_STA_NONERP)
        {
-               if(!psta->nonerp_set)
+               if (!psta->nonerp_set)
                {
                        psta->nonerp_set = 1;
 
@@ -2022,7 +1984,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
        }
        else
        {
-               if(psta->nonerp_set)
+               if (psta->nonerp_set)
                {
                        psta->nonerp_set = 0;
 
@@ -2038,9 +2000,9 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
        }
 
 
-       if(!(psta->capability & WLAN_CAPABILITY_SHORT_SLOT))
+       if (!(psta->capability & WLAN_CAPABILITY_SHORT_SLOT))
        {
-               if(!psta->no_short_slot_time_set)
+               if (!psta->no_short_slot_time_set)
                {
                        psta->no_short_slot_time_set = 1;
 
@@ -2057,7 +2019,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
        }
        else
        {
-               if(psta->no_short_slot_time_set)
+               if (psta->no_short_slot_time_set)
                {
                        psta->no_short_slot_time_set = 0;
 
@@ -2091,7 +2053,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
                        }
                        DBG_871X("%s STA " MAC_FMT " - no "
                                   "greenfield, num of non-gf stations %d\n",
-                                  __FUNCTION__, MAC_ARG(psta->hwaddr),
+                                  __func__, MAC_ARG(psta->hwaddr),
                                   pmlmepriv->num_sta_ht_no_gf);
                }
 
@@ -2102,7 +2064,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
                        }
                        DBG_871X("%s STA " MAC_FMT " - 20 MHz HT, "
                                   "num of 20MHz HT STAs %d\n",
-                                  __FUNCTION__, MAC_ARG(psta->hwaddr),
+                                  __func__, MAC_ARG(psta->hwaddr),
                                   pmlmepriv->num_sta_ht_20mhz);
                }
 
@@ -2113,10 +2075,10 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
                        psta->no_ht_set = 1;
                        pmlmepriv->num_sta_no_ht++;
                }
-               if(pmlmepriv->htpriv.ht_option == true) {
+               if (pmlmepriv->htpriv.ht_option == true) {
                        DBG_871X("%s STA " MAC_FMT
                                   " - no HT, num of non-HT stations %d\n",
-                                  __FUNCTION__, MAC_ARG(psta->hwaddr),
+                                  __func__, MAC_ARG(psta->hwaddr),
                                   pmlmepriv->num_sta_no_ht);
                }
        }
@@ -2127,20 +2089,20 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
                update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, true);
        }
 
-       //update associcated stations cap.
+       /* update associcated stations cap. */
        associated_clients_update(padapter,  beacon_updated);
 
-       DBG_871X("%s, updated=%d\n", __func__, beacon_updated);
+       DBG_871X("%s, updated =%d\n", __func__, beacon_updated);
 
 }
 
-u8 bss_cap_update_on_sta_leave(_adapter *padapter, struct sta_info *psta)
+u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta)
 {
        u8 beacon_updated = false;
        struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
        struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
 
-       if(!psta)
+       if (!psta)
                return beacon_updated;
 
        if (psta->no_short_preamble_set) {
@@ -2196,44 +2158,40 @@ u8 bss_cap_update_on_sta_leave(_adapter *padapter, struct sta_info *psta)
                update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, true);
        }
 
-       //update associcated stations cap.
-       //associated_clients_update(padapter,  beacon_updated); //move it to avoid deadlock
+       /* update associcated stations cap. */
+       /* associated_clients_update(padapter,  beacon_updated); //move it to avoid deadlock */
 
-       DBG_871X("%s, updated=%d\n", __func__, beacon_updated);
+       DBG_871X("%s, updated =%d\n", __func__, beacon_updated);
 
        return beacon_updated;
 
 }
 
-u8 ap_free_sta(_adapter *padapter, struct sta_info *psta, bool active, u16 reason)
+u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta, bool active, u16 reason)
 {
-       _irqL irqL;
        u8 beacon_updated = false;
-       struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
-       struct mlme_ext_priv    *pmlmeext = &(padapter->mlmeextpriv);
-       struct sta_priv *pstapriv = &padapter->stapriv;
 
-       if(!psta)
+       if (!psta)
                return beacon_updated;
 
        if (active == true)
        {
-               //tear down Rx AMPDU
-               send_delba(padapter, 0, psta->hwaddr);// recipient
+               /* tear down Rx AMPDU */
+               send_delba(padapter, 0, psta->hwaddr);/*  recipient */
 
-               //tear down TX AMPDU
-               send_delba(padapter, 1, psta->hwaddr);// // originator
+               /* tear down TX AMPDU */
+               send_delba(padapter, 1, psta->hwaddr);/*  // originator */
 
                issue_deauth(padapter, psta->hwaddr, reason);
        }
 
-       psta->htpriv.agg_enable_bitmap = 0x0;//reset
-       psta->htpriv.candidate_tid_bitmap = 0x0;//reset
+       psta->htpriv.agg_enable_bitmap = 0x0;/* reset */
+       psta->htpriv.candidate_tid_bitmap = 0x0;/* reset */
 
 
-       //report_del_sta_event(padapter, psta->hwaddr, reason);
+       /* report_del_sta_event(padapter, psta->hwaddr, reason); */
 
-       //clear cam entry / key
+       /* clear cam entry / key */
        rtw_clearstakey_cmd(padapter, psta, true);
 
 
@@ -2247,29 +2205,26 @@ u8 ap_free_sta(_adapter *padapter, struct sta_info *psta, bool active, u16 reaso
 
        beacon_updated = bss_cap_update_on_sta_leave(padapter, psta);
 
-       spin_lock_bh(&(pstapriv->sta_hash_lock));
        rtw_free_stainfo(padapter, psta);
-       spin_unlock_bh(&(pstapriv->sta_hash_lock));
 
 
        return beacon_updated;
 
 }
 
-int rtw_sta_flush(_adapter *padapter)
+int rtw_sta_flush(struct adapter *padapter)
 {
-       _irqL irqL;
-       _list   *phead, *plist;
-       int ret=0;
+       struct list_head        *phead, *plist;
+       int ret = 0;
        struct sta_info *psta = NULL;
        struct sta_priv *pstapriv = &padapter->stapriv;
        struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
-       struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
-       u8 bc_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff};
+       struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
+       u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
        DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(padapter->pnetdev));
 
-       if((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
+       if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
                return ret;
 
 
@@ -2277,7 +2232,7 @@ int rtw_sta_flush(_adapter *padapter)
        phead = &pstapriv->asoc_list;
        plist = get_next(phead);
 
-       //free sta asoc_queue
+       /* free sta asoc_queue */
        while (phead != plist)
        {
                psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list);
@@ -2287,9 +2242,9 @@ int rtw_sta_flush(_adapter *padapter)
                list_del_init(&psta->asoc_list);
                pstapriv->asoc_list_cnt--;
 
-               //spin_unlock_bh(&pstapriv->asoc_list_lock);
+               /* spin_unlock_bh(&pstapriv->asoc_list_lock); */
                ap_free_sta(padapter, psta, true, WLAN_REASON_DEAUTH_LEAVING);
-               //spin_lock_bh(&pstapriv->asoc_list_lock);
+               /* spin_lock_bh(&pstapriv->asoc_list_lock); */
        }
        spin_unlock_bh(&pstapriv->asoc_list_lock);
 
@@ -2303,23 +2258,23 @@ int rtw_sta_flush(_adapter *padapter)
 }
 
 /* called > TSR LEVEL for USB or SDIO Interface*/
-void sta_info_update(_adapter *padapter, struct sta_info *psta)
+void sta_info_update(struct adapter *padapter, struct sta_info *psta)
 {
        int flags = psta->flags;
        struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
 
 
-       //update wmm cap.
-       if(WLAN_STA_WME&flags)
+       /* update wmm cap. */
+       if (WLAN_STA_WME&flags)
                psta->qos_option = 1;
        else
                psta->qos_option = 0;
 
-       if(pmlmepriv->qospriv.qos_option == 0)
+       if (pmlmepriv->qospriv.qos_option == 0)
                psta->qos_option = 0;
 
-       //update 802.11n ht cap.
-       if(WLAN_STA_HT&flags)
+       /* update 802.11n ht cap. */
+       if (WLAN_STA_HT&flags)
        {
                psta->htpriv.ht_option = true;
                psta->qos_option = 1;
@@ -2329,7 +2284,7 @@ void sta_info_update(_adapter *padapter, struct sta_info *psta)
                psta->htpriv.ht_option = false;
        }
 
-       if(pmlmepriv->htpriv.ht_option == false)
+       if (pmlmepriv->htpriv.ht_option == false)
                psta->htpriv.ht_option = false;
 
        update_sta_info_apmode(padapter, psta);
@@ -2338,45 +2293,43 @@ void sta_info_update(_adapter *padapter, struct sta_info *psta)
 }
 
 /* called >= TSR LEVEL for USB or SDIO Interface*/
-void ap_sta_info_defer_update(_adapter *padapter, struct sta_info *psta)
+void ap_sta_info_defer_update(struct adapter *padapter, struct sta_info *psta)
 {
        struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
-       struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
+       struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
 
-       if(psta->state & _FW_LINKED)
+       if (psta->state & _FW_LINKED)
        {
                pmlmeinfo->FW_sta_info[psta->mac_id].psta = psta;
 
-               //add ratid
-               add_RATid(padapter, psta, 0);//DM_RATR_STA_INIT
+               /* add ratid */
+               add_RATid(padapter, psta, 0);/* DM_RATR_STA_INIT */
        }
 }
 /* restore hw setting from sw data structures */
-void rtw_ap_restore_network(_adapter *padapter)
+void rtw_ap_restore_network(struct adapter *padapter)
 {
        struct mlme_priv *mlmepriv = &padapter->mlmepriv;
-       struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
-       struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
+       struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
        struct sta_priv * pstapriv = &padapter->stapriv;
        struct sta_info *psta;
-       struct security_priv* psecuritypriv=&(padapter->securitypriv);
-       _irqL irqL;
-       _list   *phead, *plist;
+       struct security_priv* psecuritypriv =&(padapter->securitypriv);
+       struct list_head        *phead, *plist;
        u8 chk_alive_num = 0;
        char chk_alive_list[NUM_STA];
        int i;
 
-       rtw_setopmode_cmd(padapter, Ndis802_11APMode,false);
+       rtw_setopmode_cmd(padapter, Ndis802_11APMode, false);
 
        set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode);
 
-       start_bss_network(padapter, (u8*)&mlmepriv->cur_network.network);
+       start_bss_network(padapter, (u8 *)&mlmepriv->cur_network.network);
 
-       if((padapter->securitypriv.dot11PrivacyAlgrthm == _TKIP_) ||
+       if ((padapter->securitypriv.dot11PrivacyAlgrthm == _TKIP_) ||
                (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_))
        {
                /* restore group key, WEP keys is restored in ips_leave() */
-               rtw_set_key(padapter, psecuritypriv, psecuritypriv->dot118021XGrpKeyid, 0,false);
+               rtw_set_key(padapter, psecuritypriv, psecuritypriv->dot118021XGrpKeyid, 0, false);
        }
 
        spin_lock_bh(&pstapriv->asoc_list_lock);
@@ -2406,19 +2359,19 @@ void rtw_ap_restore_network(_adapter *padapter)
                } else if (psta->state &_FW_LINKED) {
                        rtw_sta_media_status_rpt(padapter, psta, 1);
                        Update_RA_Entry(padapter, psta);
-                       //pairwise key
+                       /* pairwise key */
                        /* per sta pairwise key and settings */
-                       if(     (padapter->securitypriv.dot11PrivacyAlgrthm == _TKIP_) ||
+                       if ((padapter->securitypriv.dot11PrivacyAlgrthm == _TKIP_) ||
                                (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_))
                        {
-                               rtw_setstakey_cmd(padapter, psta, true,false);
+                               rtw_setstakey_cmd(padapter, psta, true, false);
                        }
                }
        }
 
 }
 
-void start_ap_mode(_adapter *padapter)
+void start_ap_mode(struct adapter *padapter)
 {
        int i;
        struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@@ -2428,7 +2381,7 @@ void start_ap_mode(_adapter *padapter)
 
        pmlmepriv->update_bcn = false;
 
-       //init_mlme_ap_info(padapter);
+       /* init_mlme_ap_info(padapter); */
        pmlmeext->bstart_bss = false;
 
        pmlmepriv->num_sta_non_erp = 0;
@@ -2447,7 +2400,7 @@ void start_ap_mode(_adapter *padapter)
 
        pmlmepriv->ht_op_mode = 0;
 
-       for(i=0; i<NUM_STA; i++)
+       for (i = 0; i<NUM_STA; i++)
                pstapriv->sta_aid[i] = NULL;
 
        pmlmepriv->wps_beacon_ie = NULL;
@@ -2458,39 +2411,37 @@ void start_ap_mode(_adapter *padapter)
        pmlmepriv->p2p_probe_resp_ie = NULL;
 
 
-       //for ACL
+       /* for ACL */
        INIT_LIST_HEAD(&(pacl_list->acl_node_q.queue));
        pacl_list->num = 0;
        pacl_list->mode = 0;
-       for(i = 0; i < NUM_ACL; i++)
-       {
+       for (i = 0; i < NUM_ACL; i++) {
                INIT_LIST_HEAD(&pacl_list->aclnode[i].list);
                pacl_list->aclnode[i].valid = false;
        }
 
 }
 
-void stop_ap_mode(_adapter *padapter)
+void stop_ap_mode(struct adapter *padapter)
 {
-       _irqL irqL;
-       _list   *phead, *plist;
+       struct list_head        *phead, *plist;
        struct rtw_wlan_acl_node *paclnode;
-       struct sta_info *psta=NULL;
+       struct sta_info *psta = NULL;
        struct sta_priv *pstapriv = &padapter->stapriv;
        struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
        struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
        struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
-       _queue  *pacl_node_q =&pacl_list->acl_node_q;
+       struct __queue  *pacl_node_q =&pacl_list->acl_node_q;
 
        pmlmepriv->update_bcn = false;
        pmlmeext->bstart_bss = false;
 
-       //reset and init security priv , this can refine with rtw_reset_securitypriv
+       /* reset and init security priv , this can refine with rtw_reset_securitypriv */
        memset((unsigned char *)&padapter->securitypriv, 0, sizeof (struct security_priv));
        padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen;
        padapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled;
 
-       //for ACL
+       /* for ACL */
        spin_lock_bh(&(pacl_node_q->lock));
        phead = get_list_head(pacl_node_q);
        plist = get_next(phead);
@@ -2499,7 +2450,7 @@ void stop_ap_mode(_adapter *padapter)
                paclnode = LIST_CONTAINOR(plist, struct rtw_wlan_acl_node, list);
                plist = get_next(plist);
 
-               if(paclnode->valid == true)
+               if (paclnode->valid == true)
                {
                        paclnode->valid = false;
 
@@ -2510,21 +2461,19 @@ void stop_ap_mode(_adapter *padapter)
        }
        spin_unlock_bh(&(pacl_node_q->lock));
 
-       DBG_871X("%s, free acl_node_queue, num=%d\n", __func__, pacl_list->num);
+       DBG_871X("%s, free acl_node_queue, num =%d\n", __func__, pacl_list->num);
 
        rtw_sta_flush(padapter);
 
-       //free_assoc_sta_resources
+       /* free_assoc_sta_resources */
        rtw_free_all_stainfo(padapter);
 
        psta = rtw_get_bcmc_stainfo(padapter);
-       spin_lock_bh(&(pstapriv->sta_hash_lock));
        rtw_free_stainfo(padapter, psta);
-       spin_unlock_bh(&(pstapriv->sta_hash_lock));
 
        rtw_init_bcmc_stainfo(padapter);
 
        rtw_free_mlme_priv_ie_data(pmlmepriv);
 
-       rtw_btcoex_MediaStatusNotify(padapter, 0); //disconnect
+       rtw_btcoex_MediaStatusNotify(padapter, 0); /* disconnect */
 }