OSDN Git Service

Fix ERROR and CHECK instances from checkpatch for core/rtw_ioctl_set.c
authorLarry Finger <Larry.Finger@lwfinger.net>
Sun, 31 Mar 2013 00:28:51 +0000 (19:28 -0500)
committerLarry Finger <Larry.Finger@lwfinger.net>
Sun, 31 Mar 2013 00:28:51 +0000 (19:28 -0500)
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
core/rtw_ioctl_set.c

index 0b459ad..ac2dd63 100644 (file)
 extern void indicate_wx_scan_complete_event(_adapter *padapter);
 
 #define IS_MAC_ADDRESS_BROADCAST(addr) \
-( \
-       ( (addr[0] == 0xff) && (addr[1] == 0xff) && \
+(\
+       ((addr[0] == 0xff) && (addr[1] == 0xff) && \
                (addr[2] == 0xff) && (addr[3] == 0xff) && \
-               (addr[4] == 0xff) && (addr[5] == 0xff) )  ? true : false \
+               (addr[4] == 0xff) && (addr[5] == 0xff))  ? true : false \
 )
 
 u8 rtw_validate_ssid(NDIS_802_11_SSID *ssid)
 {
        u8       i;
-       u8      ret=true;
+       u8      ret = true;
 
 _func_enter_;
-
        if (ssid->SsidLength > 32) {
                RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid length >32\n"));
-               ret= false;
+               ret = false;
                goto exit;
        }
-
-       for(i = 0; i < ssid->SsidLength; i++)
-       {
-               //wifi, printable ascii code must be supported
-               if(!( (ssid->Ssid[i] >= 0x20) && (ssid->Ssid[i] <= 0x7e) )){
+       for (i = 0; i < ssid->SsidLength; i++) {
+               /* wifi, printable ascii code must be supported */
+               if (!((ssid->Ssid[i] >= 0x20) && (ssid->Ssid[i] <= 0x7e))) {
                        RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid has nonprintabl ascii\n"));
-                       ret= false;
+                       ret = false;
                        break;
                }
        }
-
 exit:
-
 _func_exit_;
-
        return ret;
 }
 
-u8 rtw_do_join(_adapter * padapter);
-u8 rtw_do_join(_adapter * padapter)
+u8 rtw_do_join(_adapter *padapter)
 {
        unsigned long   irqL;
        _list   *plist, *phead;
-       u8pibss = NULL;
+       u8 *pibss = NULL;
        struct  mlme_priv       *pmlmepriv = &(padapter->mlmepriv);
        _queue  *queue  = &(pmlmepriv->scanned_queue);
-       u8 ret=_SUCCESS;
+       u8 ret = _SUCCESS;
 
 _func_enter_;
 
        _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
        phead = get_list_head(queue);
        plist = get_next(phead);
-
-       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("\n rtw_do_join: phead = %p; plist = %p \n\n\n", phead, plist));
-
+       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("\n rtw_do_join: phead = %p; plist = %p\n\n\n", phead, plist));
        pmlmepriv->cur_network.join_res = -2;
-
        set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
-
        pmlmepriv->pscanned = plist;
-
        pmlmepriv->to_join = true;
-
-       if(_rtw_queue_empty(queue)== true)
-       {
+       if (_rtw_queue_empty(queue) == true) {
                _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
                _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
-
-               //when set_ssid/set_bssid for rtw_do_join(), but scanning queue is empty
-               //we try to issue sitesurvey firstly
-
-               if(pmlmepriv->LinkDetectInfo.bBusyTraffic==false
+               /* when set_ssid/set_bssid for rtw_do_join(), but scanning queue is empty */
+               /* we try to issue sitesurvey firstly */
+               if (pmlmepriv->LinkDetectInfo.bBusyTraffic == false
                        #ifdef CONFIG_LAYER2_ROAMING
-                       || pmlmepriv->to_roaming >0
+                       || pmlmepriv->to_roaming > 0
                        #endif
-               )
-               {
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_do_join(): site survey if scanned_queue is empty\n."));
-                       // submit site_survey_cmd
-                       if(_SUCCESS!=(ret=rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1)) ) {
+               ) {
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("rtw_do_join(): site survey if scanned_queue is empty\n."));
+                       /*  submit site_survey_cmd */
+                       ret = rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1);
+                       if (_SUCCESS != ret) {
                                pmlmepriv->to_join = false;
-                               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("rtw_do_join(): site survey return error\n."));
+                               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("rtw_do_join(): site survey return error\n."));
                        }
-               }
-               else
-               {
+               } else {
                        pmlmepriv->to_join = false;
                        ret = _FAIL;
                }
-
                goto exit;
-       }
-       else
-       {
+       } else {
                int select_ret;
                _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
-               if((select_ret=rtw_select_and_join_from_scanned_queue(pmlmepriv))==_SUCCESS)
-               {
+               select_ret = rtw_select_and_join_from_scanned_queue(pmlmepriv);
+               if (select_ret == _SUCCESS) {
                        pmlmepriv->to_join = false;
                        _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT);
-               }
-               else
-               {
-                       if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==true)
-                       {
-                               // submit createbss_cmd to change to a ADHOC_MASTER
+               } else {
+                       if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true) {
+                               /*  submit createbss_cmd to change to a ADHOC_MASTER */
 
-                               //pmlmepriv->lock has been acquired by caller...
+                               /* pmlmepriv->lock has been acquired by caller... */
                                WLAN_BSSID_EX    *pdev_network = &(padapter->registrypriv.dev_network);
 
                                pmlmepriv->fw_state = WIFI_ADHOC_MASTER_STATE;
@@ -161,58 +137,49 @@ _func_enter_;
 
                                rtw_generate_random_ibss(pibss);
 
-                               if(rtw_createbss_cmd(padapter)!=_SUCCESS)
-                               {
-                                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("***Error=>do_goin: rtw_createbss_cmd status FAIL*** \n "));
+                               if (rtw_createbss_cmd(padapter) != _SUCCESS) {
+                                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
+                                                ("***Error =>do_goin: rtw_createbss_cmd status FAIL***\n "));
                                        ret =  false;
                                        goto exit;
                                }
 
                                pmlmepriv->to_join = false;
 
-                               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("***Error=> rtw_select_and_join_from_scanned_queue FAIL under STA_Mode*** \n "));
-
-                       }
-                       else
-                       {
-                               // can't associate ; reset under-linking
+                               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_,
+                                        ("***Error => rtw_select_and_join_from_scanned_queue FAIL under STA_Mode***\n "));
+                       } else {
+                               /*  can't associate; reset under-linking */
                                _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
 
-                               //when set_ssid/set_bssid for rtw_do_join(), but there are no desired bss in scanning queue
-                               //we try to issue sitesurvey firstly
-                               if(pmlmepriv->LinkDetectInfo.bBusyTraffic==false
+                               /* when set_ssid/set_bssid for rtw_do_join(), but there are no desired bss in scanning queue */
+                               /* we try to issue sitesurvey firstly */
+                               if (pmlmepriv->LinkDetectInfo.bBusyTraffic == false
                                        #ifdef CONFIG_LAYER2_ROAMING
-                                       || pmlmepriv->to_roaming >0
+                                       || pmlmepriv->to_roaming > 0
                                        #endif
-                               )
-                               {
-                                       if( _SUCCESS!=(ret=rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1)) ){
+                               ) {
+                                       ret = rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1);
+                                       if (_SUCCESS != ret) {
                                                pmlmepriv->to_join = false;
-                                               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("do_join(): site survey return error\n."));
+                                               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("do_join(): site survey return error\n."));
                                        }
-                               }
-                               else
-                               {
+                               } else {
                                        ret = _FAIL;
                                        pmlmepriv->to_join = false;
                                }
                        }
-
                }
-
        }
-
 exit:
-
 _func_exit_;
-
        return ret;
 }
 
-u8 rtw_set_802_11_bssid(_adapterpadapter, u8 *bssid)
+u8 rtw_set_802_11_bssid(_adapter *padapter, u8 *bssid)
 {
        unsigned long irqL;
-       u8 status=_SUCCESS;
+       u8 status = _SUCCESS;
        u32 cur_time = 0;
 
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -221,9 +188,10 @@ _func_enter_;
 
        DBG_871X_LEVEL(_drv_always_, "set bssid:%pM\n", bssid);
 
-       if ((bssid[0]==0x00 && bssid[1]==0x00 && bssid[2]==0x00 && bssid[3]==0x00 && bssid[4]==0x00 &&bssid[5]==0x00) ||
-           (bssid[0]==0xFF && bssid[1]==0xFF && bssid[2]==0xFF && bssid[3]==0xFF && bssid[4]==0xFF &&bssid[5]==0xFF))
-       {
+       if ((bssid[0] == 0x00 && bssid[1] == 0x00 && bssid[2] == 0x00 &&
+            bssid[3] == 0x00 && bssid[4] == 0x00 && bssid[5] == 0x00) ||
+           (bssid[0] == 0xFF && bssid[1] == 0xFF && bssid[2] == 0xFF &&
+            bssid[3] == 0xFF && bssid[4] == 0xFF && bssid[5] == 0xFF)) {
                status = _FAIL;
                goto exit;
        }
@@ -231,25 +199,22 @@ _func_enter_;
        _enter_critical_bh(&pmlmepriv->lock, &irqL);
 
 
-       DBG_871X("Set BSSID under fw_state=0x%08x\n", get_fwstate(pmlmepriv));
-       if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) {
+       DBG_871X("Set BSSID under fw_state = 0x%08x\n", get_fwstate(pmlmepriv));
+       if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true)
                goto handle_tkip_countermeasure;
-       } else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true) {
+       else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true)
                goto release_mlme_lock;
-       }
 
-       if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE) == true)
-       {
+       if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE) == true) {
                RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_bssid: _FW_LINKED||WIFI_ADHOC_MASTER_STATE\n"));
 
-               if (_rtw_memcmp(&pmlmepriv->cur_network.network.MacAddress, bssid, ETH_ALEN) == true)
-               {
+               if (_rtw_memcmp(&pmlmepriv->cur_network.network.MacAddress, bssid, ETH_ALEN) == true) {
                        if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == false)
-                               goto release_mlme_lock;//it means driver is in WIFI_ADHOC_MASTER_STATE, we needn't create bss again.
+                               goto release_mlme_lock;/* it means driver is in WIFI_ADHOC_MASTER_STATE, we needn't create bss again. */
                } else {
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("Set BSSID not the same bssid\n"));
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("set_bssid="MAC_FMT"\n", MAC_ARG(bssid) ));
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("cur_bssid="MAC_FMT"\n", MAC_ARG(pmlmepriv->cur_network.network.MacAddress) ));
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("Set BSSID not the same bssid\n"));
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_bssid ="MAC_FMT"\n", MAC_ARG(bssid)));
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("cur_bssid ="MAC_FMT"\n", MAC_ARG(pmlmepriv->cur_network.network.MacAddress)));
 
                        rtw_disassoc_cmd(padapter);
 
@@ -266,12 +231,11 @@ _func_enter_;
        }
 
 handle_tkip_countermeasure:
-       //should we add something here...?
+       /* should we add something here...? */
 
        if (padapter->securitypriv.btkip_countermeasure == true) {
                cur_time = rtw_get_current_time();
-
-               if( (cur_time - padapter->securitypriv.btkip_countermeasure_time) > 60 * HZ ) {
+               if ((cur_time - padapter->securitypriv.btkip_countermeasure_time) > 60 * HZ) {
                        padapter->securitypriv.btkip_countermeasure = false;
                        padapter->securitypriv.btkip_countermeasure_time = 0;
                } else {
@@ -279,76 +243,66 @@ handle_tkip_countermeasure:
                        goto release_mlme_lock;
                }
        }
-
        memcpy(&pmlmepriv->assoc_bssid, bssid, ETH_ALEN);
-       pmlmepriv->assoc_by_bssid=true;
+       pmlmepriv->assoc_by_bssid = true;
 
-       if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) {
+       if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true)
                pmlmepriv->to_join = true;
-       }
-       else {
+       else
                status = rtw_do_join(padapter);
-       }
-
 release_mlme_lock:
        _exit_critical_bh(&pmlmepriv->lock, &irqL);
 
 exit:
        RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
-               ("rtw_set_802_11_bssid: status=%d\n", status));
+                ("rtw_set_802_11_bssid: status =%d\n", status));
 
 _func_exit_;
 
        return status;
 }
 
-u8 rtw_set_802_11_ssid(_adapterpadapter, NDIS_802_11_SSID *ssid)
+u8 rtw_set_802_11_ssid(_adapter *padapter, NDIS_802_11_SSID *ssid)
 {
        unsigned long irqL;
        u8 status = _SUCCESS;
        u32 cur_time = 0;
-
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
        struct wlan_network *pnetwork = &pmlmepriv->cur_network;
 
 _func_enter_;
 
-       DBG_871X_LEVEL(_drv_always_, "set ssid [%s] fw_state=0x%08x\n",
-                       ssid->Ssid, get_fwstate(pmlmepriv));
+       DBG_871X_LEVEL(_drv_always_, "set ssid [%s] fw_state = 0x%08x\n",
+                      ssid->Ssid, get_fwstate(pmlmepriv));
 
-       if(padapter->hw_init_completed==false){
+       if (padapter->hw_init_completed == false) {
                RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
-                        ("set_ssid: hw_init_completed==false=>exit!!!\n"));
+                        ("set_ssid: hw_init_completed == false =>exit!!!\n"));
                status = _FAIL;
                goto exit;
        }
 
        _enter_critical_bh(&pmlmepriv->lock, &irqL);
 
-       DBG_871X("Set SSID under fw_state=0x%08x\n", get_fwstate(pmlmepriv));
-       if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) {
+       DBG_871X("Set SSID under fw_state = 0x%08x\n", get_fwstate(pmlmepriv));
+       if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true)
                goto handle_tkip_countermeasure;
-       } else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true) {
+       else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true)
                goto release_mlme_lock;
-       }
 
-       if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE) == true)
-       {
+       if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE) == true) {
                RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_,
                         ("set_ssid: _FW_LINKED||WIFI_ADHOC_MASTER_STATE\n"));
 
                if ((pmlmepriv->assoc_ssid.SsidLength == ssid->SsidLength) &&
-                   (_rtw_memcmp(&pmlmepriv->assoc_ssid.Ssid, ssid->Ssid, ssid->SsidLength) == true))
-               {
-                       if((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == false))
-                       {
+                   (_rtw_memcmp(&pmlmepriv->assoc_ssid.Ssid, ssid->Ssid, ssid->SsidLength) == true)) {
+                       if ((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == false)) {
                                RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
-                                        ("Set SSID is the same ssid, fw_state=0x%08x\n",
+                                        ("Set SSID is the same ssid, fw_state = 0x%08x\n",
                                          get_fwstate(pmlmepriv)));
 
-                               if(rtw_is_same_ibss(padapter, pnetwork) == false)
-                               {
-                                       //if in WIFI_ADHOC_MASTER_STATE | WIFI_ADHOC_STATE, create bss or rejoin again
+                               if (rtw_is_same_ibss(padapter, pnetwork) == false) {
+                                       /* if in WIFI_ADHOC_MASTER_STATE | WIFI_ADHOC_STATE, create bss or rejoin again */
                                        rtw_disassoc_cmd(padapter);
 
                                        if (check_fwstate(pmlmepriv, _FW_LINKED) == true)
@@ -360,10 +314,8 @@ _func_enter_;
                                                _clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE);
                                                set_fwstate(pmlmepriv, WIFI_ADHOC_STATE);
                                        }
-                               }
-                               else
-                               {
-                                       goto release_mlme_lock;//it means driver is in WIFI_ADHOC_MASTER_STATE, we needn't create bss again.
+                               } else {
+                                       goto release_mlme_lock;/* it means driver is in WIFI_ADHOC_MASTER_STATE, we needn't create bss again. */
                                }
                        }
 #ifdef CONFIG_LPS
@@ -371,98 +323,76 @@ _func_enter_;
                                rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_JOINBSS, 1);
                        }
 #endif
-               }
-               else
-               {
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("Set SSID not the same ssid\n"));
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("set_ssid=[%s] len=0x%x\n", ssid->Ssid, (unsigned int)ssid->SsidLength));
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("assoc_ssid=[%s] len=0x%x\n", pmlmepriv->assoc_ssid.Ssid, (unsigned int)pmlmepriv->assoc_ssid.SsidLength));
+               } else {
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("Set SSID not the same ssid\n"));
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_ssid =[%s] len = 0x%x\n", ssid->Ssid, (unsigned int)ssid->SsidLength));
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("assoc_ssid =[%s] len = 0x%x\n", pmlmepriv->assoc_ssid.Ssid, (unsigned int)pmlmepriv->assoc_ssid.SsidLength));
 
                        rtw_disassoc_cmd(padapter);
 
                        if (check_fwstate(pmlmepriv, _FW_LINKED) == true)
                                rtw_indicate_disconnect(padapter);
-
                        rtw_free_assoc_resources(padapter, 1);
-
                        if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true) {
                                _clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE);
                                set_fwstate(pmlmepriv, WIFI_ADHOC_STATE);
                        }
                }
        }
-
 handle_tkip_countermeasure:
-
        if (padapter->securitypriv.btkip_countermeasure == true) {
                cur_time = rtw_get_current_time();
-
-               if( (cur_time - padapter->securitypriv.btkip_countermeasure_time) > 60 * HZ )
-               {
+               if ((cur_time - padapter->securitypriv.btkip_countermeasure_time) > 60 * HZ) {
                        padapter->securitypriv.btkip_countermeasure = false;
                        padapter->securitypriv.btkip_countermeasure_time = 0;
-               }
-               else
-               {
+               } else {
                        status = _FAIL;
                        goto release_mlme_lock;
                }
        }
-
        #ifdef CONFIG_VALIDATE_SSID
        if (rtw_validate_ssid(ssid) == false) {
                status = _FAIL;
                goto release_mlme_lock;
        }
        #endif
-
        memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(NDIS_802_11_SSID));
-       pmlmepriv->assoc_by_bssid=false;
+       pmlmepriv->assoc_by_bssid = false;
 
-       if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) {
+       if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true)
                pmlmepriv->to_join = true;
-       }
-       else {
+       else
                status = rtw_do_join(padapter);
-       }
-
 release_mlme_lock:
        _exit_critical_bh(&pmlmepriv->lock, &irqL);
-
 exit:
        RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
-               ("-rtw_set_802_11_ssid: status=%d\n", status));
-
+                ("-rtw_set_802_11_ssid: status =%d\n", status));
 _func_exit_;
-
        return status;
-
 }
 
-u8 rtw_set_802_11_infrastructure_mode(_adapterpadapter,
+u8 rtw_set_802_11_infrastructure_mode(_adapter *padapter,
        NDIS_802_11_NETWORK_INFRASTRUCTURE networktype)
 {
        unsigned long irqL;
        struct  mlme_priv       *pmlmepriv = &padapter->mlmepriv;
        struct  wlan_network    *cur_network = &pmlmepriv->cur_network;
-       NDIS_802_11_NETWORK_INFRASTRUCTUREpold_state = &(cur_network->network.InfrastructureMode);
+       NDIS_802_11_NETWORK_INFRASTRUCTURE *pold_state = &(cur_network->network.InfrastructureMode);
 
 _func_enter_;
 
-       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_notice_,
-                ("+rtw_set_802_11_infrastructure_mode: old=%d new=%d fw_state=0x%08x\n",
+       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_notice_,
+                ("+rtw_set_802_11_infrastructure_mode: old =%d new =%d fw_state = 0x%08x\n",
                  *pold_state, networktype, get_fwstate(pmlmepriv)));
 
-       if(*pold_state != networktype)
-       {
+       if (*pold_state != networktype) {
                _enter_critical_bh(&pmlmepriv->lock, &irqL);
 
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,(" change mode!"));
-               //DBG_871X("change mode, old_mode=%d, new_mode=%d, fw_state=0x%x\n", *pold_state, networktype, get_fwstate(pmlmepriv));
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, (" change mode!"));
 
-               if(*pold_state==Ndis802_11APMode)
-               {
-                       //change to other mode from Ndis802_11APMode
+               if (*pold_state == Ndis802_11APMode) {
+                       /* change to other mode from Ndis802_11APMode */
                        cur_network->join_res = -1;
 
 #ifdef CONFIG_NATIVEAP_MLME
@@ -470,75 +400,58 @@ _func_enter_;
 #endif
                }
 
-               if((check_fwstate(pmlmepriv, _FW_LINKED)== true) ||(*pold_state==Ndis802_11IBSS))
+               if ((check_fwstate(pmlmepriv, _FW_LINKED) == true) ||
+                   (*pold_state == Ndis802_11IBSS))
                        rtw_disassoc_cmd(padapter);
 
-               if((check_fwstate(pmlmepriv, _FW_LINKED)== true) ||
-                       (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)== true) )
+               if ((check_fwstate(pmlmepriv, _FW_LINKED) == true) ||
+                   (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true))
                        rtw_free_assoc_resources(padapter, 1);
 
-               if((*pold_state == Ndis802_11Infrastructure) ||(*pold_state == Ndis802_11IBSS))
-              {
-                       if(check_fwstate(pmlmepriv, _FW_LINKED) == true)
-                       {
-                               rtw_indicate_disconnect(padapter); //will clr Linked_state; before this function, we must have chked whether  issue dis-assoc_cmd or not
-                       }
+               if ((*pold_state == Ndis802_11Infrastructure) ||
+                   (*pold_state == Ndis802_11IBSS)) {
+                       if (check_fwstate(pmlmepriv, _FW_LINKED) == true)
+                               rtw_indicate_disconnect(padapter); /* will clr Linked_state; before this function, we must have chked whether  issue dis-assoc_cmd or not */
               }
 
                *pold_state = networktype;
 
                _clr_fwstate_(pmlmepriv, ~WIFI_NULL_STATE);
 
-               switch(networktype)
-               {
-                       case Ndis802_11IBSS:
-                               set_fwstate(pmlmepriv, WIFI_ADHOC_STATE);
-                               break;
-
-                       case Ndis802_11Infrastructure:
-                               set_fwstate(pmlmepriv, WIFI_STATION_STATE);
-                               break;
-
-                       case Ndis802_11APMode:
-                               set_fwstate(pmlmepriv, WIFI_AP_STATE);
+               switch (networktype) {
+               case Ndis802_11IBSS:
+                       set_fwstate(pmlmepriv, WIFI_ADHOC_STATE);
+                       break;
+               case Ndis802_11Infrastructure:
+                       set_fwstate(pmlmepriv, WIFI_STATION_STATE);
+                       break;
+               case Ndis802_11APMode:
+                       set_fwstate(pmlmepriv, WIFI_AP_STATE);
 #ifdef CONFIG_NATIVEAP_MLME
-                               start_ap_mode(padapter);
-                               //rtw_indicate_connect(padapter);
+                       start_ap_mode(padapter);
 #endif
-
-                               break;
-
-                       case Ndis802_11AutoUnknown:
-                       case Ndis802_11InfrastructureMax:
-                               break;
+                       break;
+               case Ndis802_11AutoUnknown:
+               case Ndis802_11InfrastructureMax:
+                       break;
                }
-
-               //SecClearAllKeys(adapter);
-
-               //RT_TRACE(COMP_OID_SET, DBG_LOUD, ("set_infrastructure: fw_state:%x after changing mode\n",
-               //                                                                      get_fwstate(pmlmepriv) ));
-
                _exit_critical_bh(&pmlmepriv->lock, &irqL);
        }
-
 _func_exit_;
-
        return true;
 }
 
-
 u8 rtw_set_802_11_disassociate(_adapter *padapter)
 {
        unsigned long irqL;
-       struct mlme_priv * pmlmepriv = &padapter->mlmepriv;
+       struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 
 _func_enter_;
 
        _enter_critical_bh(&pmlmepriv->lock, &irqL);
 
-       if (check_fwstate(pmlmepriv, _FW_LINKED) == true)
-       {
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("MgntActrtw_set_802_11_disassociate: rtw_indicate_disconnect\n"));
+       if (check_fwstate(pmlmepriv, _FW_LINKED) == true) {
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("MgntActrtw_set_802_11_disassociate: rtw_indicate_disconnect\n"));
 
                rtw_disassoc_cmd(padapter);
                rtw_indicate_disconnect(padapter);
@@ -553,42 +466,45 @@ _func_exit_;
        return true;
 }
 
-u8 rtw_set_802_11_bssid_list_scan(_adapterpadapter, NDIS_802_11_SSID *pssid, int ssid_max_num)
+u8 rtw_set_802_11_bssid_list_scan(_adapter *padapter, NDIS_802_11_SSID *pssid, int ssid_max_num)
 {
        unsigned long   irqL;
-       struct  mlme_priv               *pmlmepriv= &padapter->mlmepriv;
-       u8      res=true;
+       struct  mlme_priv               *pmlmepriv = &padapter->mlmepriv;
+       u8      res = true;
 
 _func_enter_;
 
-       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("+rtw_set_802_11_bssid_list_scan(), fw_state=%x\n", get_fwstate(pmlmepriv)));
+       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("+rtw_set_802_11_bssid_list_scan(), fw_state =%x\n", get_fwstate(pmlmepriv)));
 
        if (padapter == NULL) {
-               res=false;
+               res = false;
                goto exit;
        }
-       if (padapter->hw_init_completed==false){
+       if (padapter->hw_init_completed == false) {
                res = false;
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n===rtw_set_802_11_bssid_list_scan:hw_init_completed==false===\n"));
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("\n === rtw_set_802_11_bssid_list_scan:hw_init_completed == false ===\n"));
                goto exit;
        }
 
        if ((check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true) ||
-               (pmlmepriv->LinkDetectInfo.bBusyTraffic == true))
-       {
-               // Scan or linking is in progress, do nothing.
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("rtw_set_802_11_bssid_list_scan fail since fw_state = %x\n", get_fwstate(pmlmepriv)));
+           (pmlmepriv->LinkDetectInfo.bBusyTraffic == true)) {
+               /*  Scan or linking is in progress, do nothing. */
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
+                        ("rtw_set_802_11_bssid_list_scan fail since fw_state = %x\n",
+                         get_fwstate(pmlmepriv)));
                res = true;
 
-               if(check_fwstate(pmlmepriv, (_FW_UNDER_SURVEY|_FW_UNDER_LINKING))== true){
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n###_FW_UNDER_SURVEY|_FW_UNDER_LINKING\n\n"));
+               if (check_fwstate(pmlmepriv, (_FW_UNDER_SURVEY|_FW_UNDER_LINKING)) == true) {
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
+                                ("\n###_FW_UNDER_SURVEY|_FW_UNDER_LINKING\n\n"));
                } else {
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n###pmlmepriv->sitesurveyctrl.traffic_busy==true\n\n"));
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
+                                ("\n###pmlmepriv->sitesurveyctrl.traffic_busy == true\n\n"));
                }
        } else {
                #ifdef CONFIG_SET_SCAN_DENY_TIMER
-               if(ATOMIC_READ(&pmlmepriv->set_scan_deny)==1){
-                       DBG_871X("%s:%d CONFIG_SET_SCAN_DENY_TIMER deny scan\n", __FUNCTION__, __LINE__);
+               if (ATOMIC_READ(&pmlmepriv->set_scan_deny) == 1) {
+                       DBG_871X("%s:%d CONFIG_SET_SCAN_DENY_TIMER deny scan\n", __func__, __LINE__);
                        indicate_wx_scan_complete_event(padapter);
                        return _SUCCESS;
                }
@@ -607,7 +523,7 @@ _func_exit_;
        return res;
 }
 
-u8 rtw_set_802_11_authentication_mode(_adapterpadapter, NDIS_802_11_AUTHENTICATION_MODE authmode)
+u8 rtw_set_802_11_authentication_mode(_adapter *padapter, NDIS_802_11_AUTHENTICATION_MODE authmode)
 {
        struct security_priv *psecuritypriv = &padapter->securitypriv;
        int res;
@@ -615,495 +531,421 @@ u8 rtw_set_802_11_authentication_mode(_adapter* padapter, NDIS_802_11_AUTHENTICA
 
 _func_enter_;
 
-       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("set_802_11_auth.mode(): mode=%x\n", authmode));
+       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_802_11_auth.mode(): mode =%x\n", authmode));
 
-       psecuritypriv->ndisauthtype=authmode;
+       psecuritypriv->ndisauthtype = authmode;
 
-       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_authentication_mode:psecuritypriv->ndisauthtype=%d", psecuritypriv->ndisauthtype));
+       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("rtw_set_802_11_authentication_mode:psecuritypriv->ndisauthtype =%d", psecuritypriv->ndisauthtype));
 
-       if(psecuritypriv->ndisauthtype>3)
-               psecuritypriv->dot11AuthAlgrthm=dot11AuthAlgrthm_8021X;
+       if (psecuritypriv->ndisauthtype > 3)
+               psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X;
 
 #ifdef CONFIG_WAPI_SUPPORT
-       if(psecuritypriv->ndisauthtype == 6)
-               psecuritypriv->dot11AuthAlgrthm=dot11AuthAlgrthm_WAPI;
+       if (psecuritypriv->ndisauthtype == 6)
+               psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_WAPI;
 #endif
 
-       res=rtw_set_auth(padapter,psecuritypriv);
+       res = rtw_set_auth(padapter, psecuritypriv);
 
-       if(res==_SUCCESS)
-               ret=true;
+       if (res == _SUCCESS)
+               ret = true;
        else
-               ret=false;
+               ret = false;
 
 _func_exit_;
 
        return ret;
 }
 
-u8 rtw_set_802_11_add_wep(_adapter* padapter, NDIS_802_11_WEP *wep){
-
+u8 rtw_set_802_11_add_wep(_adapter *padapter, NDIS_802_11_WEP *wep)
+{
        u8              bdefaultkey;
        u8              btransmitkey;
-       sint            keyid,res;
-       struct security_priv* psecuritypriv=&(padapter->securitypriv);
-       u8              ret=_SUCCESS;
+       sint            keyid, res;
+       struct security_priv *psecuritypriv = &(padapter->securitypriv);
+       u8              ret = _SUCCESS;
 
 _func_enter_;
 
-       bdefaultkey=(wep->KeyIndex & 0x40000000) > 0 ? false : true;   //for ???
-       btransmitkey= (wep->KeyIndex & 0x80000000) > 0 ? true  : false; //for ???
-       keyid=wep->KeyIndex & 0x3fffffff;
+       bdefaultkey = (wep->KeyIndex & 0x40000000) > 0 ? false : true;   /* for ??? */
+       btransmitkey = (wep->KeyIndex & 0x80000000) > 0 ? true  : false;        /* for ??? */
+       keyid = wep->KeyIndex & 0x3fffffff;
 
-       if(keyid>4)
-       {
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("MgntActrtw_set_802_11_add_wep:keyid>4=>fail\n"));
-               ret=false;
+       if (keyid > 4) {
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("MgntActrtw_set_802_11_add_wep:keyid>4 =>fail\n"));
+               ret = false;
                goto exit;
        }
 
-       switch(wep->KeyLength)
-       {
-               case 5:
-                       psecuritypriv->dot11PrivacyAlgrthm=_WEP40_;
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("MgntActrtw_set_802_11_add_wep:wep->KeyLength=5\n"));
-                       break;
-               case 13:
-                       psecuritypriv->dot11PrivacyAlgrthm=_WEP104_;
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("MgntActrtw_set_802_11_add_wep:wep->KeyLength=13\n"));
-                       break;
-               default:
-                       psecuritypriv->dot11PrivacyAlgrthm=_NO_PRIVACY_;
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("MgntActrtw_set_802_11_add_wep:wep->KeyLength!=5 or 13\n"));
-                       break;
+       switch (wep->KeyLength) {
+       case 5:
+               psecuritypriv->dot11PrivacyAlgrthm = _WEP40_;
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("MgntActrtw_set_802_11_add_wep:wep->KeyLength = 5\n"));
+               break;
+       case 13:
+               psecuritypriv->dot11PrivacyAlgrthm = _WEP104_;
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("MgntActrtw_set_802_11_add_wep:wep->KeyLength = 13\n"));
+               break;
+       default:
+               psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_;
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("MgntActrtw_set_802_11_add_wep:wep->KeyLength!= 5 or 13\n"));
+               break;
        }
 
-       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_wep:befor memcpy, wep->KeyLength=0x%x wep->KeyIndex=0x%x  keyid =%x\n",wep->KeyLength,wep->KeyIndex,keyid));
-
-       memcpy(&(psecuritypriv->dot11DefKey[keyid].skey[0]),&(wep->KeyMaterial),wep->KeyLength);
-
-       psecuritypriv->dot11DefKeylen[keyid]=wep->KeyLength;
-
-       psecuritypriv->dot11PrivacyKeyIndex=keyid;
-
-       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_wep:security key material : %x %x %x %x %x %x %x %x %x %x %x %x %x \n",
-               psecuritypriv->dot11DefKey[keyid].skey[0],psecuritypriv->dot11DefKey[keyid].skey[1],psecuritypriv->dot11DefKey[keyid].skey[2],
-               psecuritypriv->dot11DefKey[keyid].skey[3],psecuritypriv->dot11DefKey[keyid].skey[4],psecuritypriv->dot11DefKey[keyid].skey[5],
-               psecuritypriv->dot11DefKey[keyid].skey[6],psecuritypriv->dot11DefKey[keyid].skey[7],psecuritypriv->dot11DefKey[keyid].skey[8],
-               psecuritypriv->dot11DefKey[keyid].skey[9],psecuritypriv->dot11DefKey[keyid].skey[10],psecuritypriv->dot11DefKey[keyid].skey[11],
-               psecuritypriv->dot11DefKey[keyid].skey[12]));
-
-       res=rtw_set_key(padapter,psecuritypriv, keyid, 1);
-
-       if(res==_FAIL)
-               ret= false;
+       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_,
+                ("rtw_set_802_11_add_wep:befor memcpy, wep->KeyLength = 0x%x wep->KeyIndex = 0x%x  keyid =%x\n",
+                 wep->KeyLength, wep->KeyIndex, keyid));
+
+       memcpy(&(psecuritypriv->dot11DefKey[keyid].skey[0]), &(wep->KeyMaterial), wep->KeyLength);
+
+       psecuritypriv->dot11DefKeylen[keyid] = wep->KeyLength;
+       psecuritypriv->dot11PrivacyKeyIndex = keyid;
+       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_,
+                ("rtw_set_802_11_add_wep:security key material : %x %x %x %x %x %x %x %x %x %x %x %x %x\n",
+                psecuritypriv->dot11DefKey[keyid].skey[0],
+                psecuritypriv->dot11DefKey[keyid].skey[1],
+                psecuritypriv->dot11DefKey[keyid].skey[2],
+                psecuritypriv->dot11DefKey[keyid].skey[3],
+                psecuritypriv->dot11DefKey[keyid].skey[4],
+                psecuritypriv->dot11DefKey[keyid].skey[5],
+                psecuritypriv->dot11DefKey[keyid].skey[6],
+                psecuritypriv->dot11DefKey[keyid].skey[7],
+                psecuritypriv->dot11DefKey[keyid].skey[8],
+                psecuritypriv->dot11DefKey[keyid].skey[9],
+                psecuritypriv->dot11DefKey[keyid].skey[10],
+                psecuritypriv->dot11DefKey[keyid].skey[11],
+                psecuritypriv->dot11DefKey[keyid].skey[12]));
+       res = rtw_set_key(padapter, psecuritypriv, keyid, 1);
+       if (res == _FAIL)
+               ret = false;
 exit:
-
 _func_exit_;
-
        return ret;
-
 }
 
-u8 rtw_set_802_11_remove_wep(_adapter* padapter, u32 keyindex){
-
-       u8 ret=_SUCCESS;
+u8 rtw_set_802_11_remove_wep(_adapter *padapter, u32 keyindex)
+{
+       u8 ret = _SUCCESS;
 
 _func_enter_;
-
-       if (keyindex >= 0x80000000 || padapter == NULL){
-
-               ret=false;
+       if (keyindex >= 0x80000000 || padapter == NULL) {
+               ret = false;
                goto exit;
-
-       }
-       else
-       {
+       } else {
                int res;
-               struct security_priv* psecuritypriv=&(padapter->securitypriv);
-               if( keyindex < 4 ){
-
+               struct security_priv *psecuritypriv = &(padapter->securitypriv);
+               if (keyindex < 4) {
                        memset(&psecuritypriv->dot11DefKey[keyindex], 0, 16);
-
-                       res=rtw_set_key(padapter,psecuritypriv,keyindex, 0);
-
-                       psecuritypriv->dot11DefKeylen[keyindex]=0;
-
-                       if(res==_FAIL)
-                               ret=_FAIL;
-
-               }
-               else
-               {
-                       ret=_FAIL;
+                       res = rtw_set_key(padapter, psecuritypriv, keyindex, 0);
+                       psecuritypriv->dot11DefKeylen[keyindex] = 0;
+                       if (res == _FAIL)
+                               ret = _FAIL;
+               } else {
+                       ret = _FAIL;
                }
-
        }
-
 exit:
-
 _func_exit_;
-
        return ret;
-
 }
 
-u8 rtw_set_802_11_add_key(_adapter* padapter, NDIS_802_11_KEY *key){
-
+u8 rtw_set_802_11_add_key(_adapter *padapter, NDIS_802_11_KEY *key)
+{
        uint    encryptionalgo;
-       u8 * pbssid;
+       u8 *pbssid;
        struct sta_info *stainfo;
        u8      bgroup = false;
-       u8      bgrouptkey = false;//can be remove later
-       u8      ret=_SUCCESS;
+       u8      bgrouptkey = false;/* can be remove later */
+       u8      ret = _SUCCESS;
 
 _func_enter_;
-
-       if (((key->KeyIndex & 0x80000000) == 0) && ((key->KeyIndex & 0x40000000) > 0)){
-
-               // It is invalid to clear bit 31 and set bit 30. If the miniport driver encounters this combination,
-               // it must fail the request and return NDIS_STATUS_INVALID_DATA.
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_key: ((key->KeyIndex & 0x80000000) == 0)[=%d] ",(int)(key->KeyIndex & 0x80000000) == 0));
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_key:((key->KeyIndex & 0x40000000) > 0)[=%d]" , (int)(key->KeyIndex & 0x40000000) > 0));
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("rtw_set_802_11_add_key: key->KeyIndex=%d \n" ,(int)key->KeyIndex));
-               ret= _FAIL;
+       if (((key->KeyIndex & 0x80000000) == 0) &&
+           ((key->KeyIndex & 0x40000000) > 0)) {
+               /*  It is invalid to clear bit 31 and set bit 30. If the miniport driver encounters this combination, */
+               /*  it must fail the request and return NDIS_STATUS_INVALID_DATA. */
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_,
+                        ("rtw_set_802_11_add_key: ((key->KeyIndex & 0x80000000) == 0)[=%d]",
+                         (int)(key->KeyIndex & 0x80000000) == 0));
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_,
+                        ("rtw_set_802_11_add_key:((key->KeyIndex & 0x40000000) > 0)[=%d]",
+                         (int)(key->KeyIndex & 0x40000000) > 0));
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_,
+                        ("rtw_set_802_11_add_key: key->KeyIndex =%d\n",
+                         (int)key->KeyIndex));
+               ret = _FAIL;
                goto exit;
        }
+       if (key->KeyIndex & 0x40000000) {
+               /*  Pairwise key */
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
+                        ("OID_802_11_ADD_KEY: +++++ Pairwise key +++++\n"));
 
-       if(key->KeyIndex & 0x40000000)
-       {
-               // Pairwise key
-
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY: +++++ Pairwise key +++++\n"));
-
-               pbssid=get_bssid(&padapter->mlmepriv);
-               stainfo=rtw_get_stainfo(&padapter->stapriv, pbssid);
+               pbssid = get_bssid(&padapter->mlmepriv);
+               stainfo = rtw_get_stainfo(&padapter->stapriv, pbssid);
 
-               if((stainfo!=NULL)&&(padapter->securitypriv.dot11AuthAlgrthm==dot11AuthAlgrthm_8021X)){
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY:( stainfo!=NULL)&&(Adapter->securitypriv.dot11AuthAlgrthm==dot11AuthAlgrthm_8021X)\n"));
-                       encryptionalgo=stainfo->dot118021XPrivacy;
-               }
-               else{
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY: stainfo==NULL)||(Adapter->securitypriv.dot11AuthAlgrthm!=dot11AuthAlgrthm_8021X)\n"));
-                       encryptionalgo=padapter->securitypriv.dot11PrivacyAlgrthm;
+               if ((stainfo != NULL) &&
+                   (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X)) {
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
+                                ("OID_802_11_ADD_KEY:(stainfo!= NULL)&&(Adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X)\n"));
+                       encryptionalgo = stainfo->dot118021XPrivacy;
+               } else {
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
+                                ("OID_802_11_ADD_KEY: stainfo == NULL)||(Adapter->securitypriv.dot11AuthAlgrthm!= dot11AuthAlgrthm_8021X)\n"));
+                       encryptionalgo = padapter->securitypriv.dot11PrivacyAlgrthm;
                }
 
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("rtw_set_802_11_add_key: (encryptionalgo ==%d)!\n",encryptionalgo ));
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("rtw_set_802_11_add_key: (Adapter->securitypriv.dot11PrivacyAlgrthm ==%d)!\n",padapter->securitypriv.dot11PrivacyAlgrthm));
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("rtw_set_802_11_add_key: (Adapter->securitypriv.dot11AuthAlgrthm ==%d)!\n",padapter->securitypriv.dot11AuthAlgrthm));
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
+                        ("rtw_set_802_11_add_key: (encryptionalgo ==%d)!\n",
+                         encryptionalgo));
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
+                        ("rtw_set_802_11_add_key: (Adapter->securitypriv.dot11PrivacyAlgrthm ==%d)!\n",
+                         padapter->securitypriv.dot11PrivacyAlgrthm));
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
+                        ("rtw_set_802_11_add_key: (Adapter->securitypriv.dot11AuthAlgrthm ==%d)!\n",
+                         padapter->securitypriv.dot11AuthAlgrthm));
 
-               if((stainfo!=NULL)){
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("rtw_set_802_11_add_key: (stainfo->dot118021XPrivacy ==%d)!\n", stainfo->dot118021XPrivacy));
+               if ((stainfo != NULL)) {
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
+                                ("rtw_set_802_11_add_key: (stainfo->dot118021XPrivacy ==%d)!\n",
+                                stainfo->dot118021XPrivacy));
                }
-
-               if(key->KeyIndex & 0x000000FF){
-                       // The key index is specified in the lower 8 bits by values of zero to 255.
-                       // The key index should be set to zero for a Pairwise key, and the driver should fail with
-                       // NDIS_STATUS_INVALID_DATA if the lower 8 bits is not zero
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,(" key->KeyIndex & 0x000000FF.\n"));
-                       ret= _FAIL;
+               if (key->KeyIndex & 0x000000FF) {
+                       /*  The key index is specified in the lower 8 bits by values of zero to 255. */
+                       /*  The key index should be set to zero for a Pairwise key, and the driver should fail with */
+                       /*  NDIS_STATUS_INVALID_DATA if the lower 8 bits is not zero */
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, (" key->KeyIndex & 0x000000FF.\n"));
+                       ret = _FAIL;
                        goto exit;
                }
-
-               // check BSSID
-               if (IS_MAC_ADDRESS_BROADCAST(key->BSSID) == true){
-
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("MacAddr_isBcst(key->BSSID)\n"));
-                       ret= false;
+               /*  check BSSID */
+               if (IS_MAC_ADDRESS_BROADCAST(key->BSSID) == true) {
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("MacAddr_isBcst(key->BSSID)\n"));
+                       ret = false;
                        goto exit;
                }
-
-               // Check key length for TKIP.
-               //if(encryptionAlgorithm == RT_ENC_TKIP_ENCRYPTION && key->KeyLength != 32)
-               if((encryptionalgo== _TKIP_)&& (key->KeyLength != 32)){
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("TKIP KeyLength:0x%x != 32\n", key->KeyLength));
-                       ret=_FAIL;
+               /*  Check key length for TKIP. */
+               /* if (encryptionAlgorithm == RT_ENC_TKIP_ENCRYPTION && key->KeyLength != 32) */
+               if ((encryptionalgo == _TKIP_) && (key->KeyLength != 32)) {
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("TKIP KeyLength:0x%x != 32\n", key->KeyLength));
+                       ret = _FAIL;
                        goto exit;
-
                }
-
-               // Check key length for AES.
-               if((encryptionalgo== _AES_)&& (key->KeyLength != 16)) {
-                       // For our supplicant, EAPPkt9x.vxd, cannot differentiate TKIP and AES case.
-                       if(key->KeyLength == 32) {
+               /*  Check key length for AES. */
+               if ((encryptionalgo == _AES_) && (key->KeyLength != 16)) {
+                       /*  For our supplicant, EAPPkt9x.vxd, cannot differentiate TKIP and AES case. */
+                       if (key->KeyLength == 32) {
                                key->KeyLength = 16;
                        } else {
-                               ret= _FAIL;
+                               ret = _FAIL;
                                goto exit;
                        }
                }
-
-               // Check key length for WEP. For NDTEST, 2005.01.27, by rcnjko.
-               if(     (encryptionalgo== _WEP40_|| encryptionalgo== _WEP104_) && (key->KeyLength != 5 || key->KeyLength != 13)) {
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("WEP KeyLength:0x%x != 5 or 13\n", key->KeyLength));
-                       ret=_FAIL;
+               /*  Check key length for WEP. For NDTEST, 2005.01.27, by rcnjko. */
+               if ((encryptionalgo == _WEP40_ || encryptionalgo == _WEP104_) &&
+                   (key->KeyLength != 5 || key->KeyLength != 13)) {
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("WEP KeyLength:0x%x != 5 or 13\n", key->KeyLength));
+                       ret = _FAIL;
                        goto exit;
                }
-
                bgroup = false;
-
-               // Check the pairwise key. Added by Annie, 2005-07-06.
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("------------------------------------------\n"));
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("[Pairwise Key set]\n"));
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("------------------------------------------\n"));
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("key index: 0x%8x(0x%8x)\n", key->KeyIndex,(key->KeyIndex&0x3)));
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("key Length: %d\n", key->KeyLength));
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("------------------------------------------\n"));
-
-       }
-       else
-       {
-               // Group key - KeyIndex(BIT30==0)
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY: +++++ Group key +++++\n"));
-
-
-               // when add wep key through add key and didn't assigned encryption type before
-               if((padapter->securitypriv.ndisauthtype<=3)&&(padapter->securitypriv.dot118021XGrpPrivacy==0))
-               {
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("keylen=%d( Adapter->securitypriv.dot11PrivacyAlgrthm=%x  )padapter->securitypriv.dot118021XGrpPrivacy(%x)\n", key->KeyLength,padapter->securitypriv.dot11PrivacyAlgrthm,padapter->securitypriv.dot118021XGrpPrivacy));
-
-                       switch(key->KeyLength)
-                       {
-                               case 5:
-                                       padapter->securitypriv.dot11PrivacyAlgrthm=_WEP40_;
-                                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("Adapter->securitypriv.dot11PrivacyAlgrthm= %x key->KeyLength=%u\n", padapter->securitypriv.dot11PrivacyAlgrthm,key->KeyLength));
-                                       break;
-                               case 13:
-                                       padapter->securitypriv.dot11PrivacyAlgrthm=_WEP104_;
-                                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("Adapter->securitypriv.dot11PrivacyAlgrthm= %x key->KeyLength=%u\n", padapter->securitypriv.dot11PrivacyAlgrthm,key->KeyLength));
-                                       break;
-                               default:
-                                       padapter->securitypriv.dot11PrivacyAlgrthm=_NO_PRIVACY_;
-                                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("Adapter->securitypriv.dot11PrivacyAlgrthm= %x key->KeyLength=%u \n", padapter->securitypriv.dot11PrivacyAlgrthm,key->KeyLength));
-                                       break;
+               /*  Check the pairwise key. Added by Annie, 2005-07-06. */
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("------------------------------------------\n"));
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("[Pairwise Key set]\n"));
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("------------------------------------------\n"));
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("key index: 0x%8x(0x%8x)\n", key->KeyIndex, (key->KeyIndex&0x3)));
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("key Length: %d\n", key->KeyLength));
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("------------------------------------------\n"));
+       } else {
+               /*  Group key - KeyIndex(BIT30 == 0) */
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("OID_802_11_ADD_KEY: +++++ Group key +++++\n"));
+
+               /*  when add wep key through add key and didn't assigned encryption type before */
+               if ((padapter->securitypriv.ndisauthtype <= 3) &&
+                   (padapter->securitypriv.dot118021XGrpPrivacy == 0)) {
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
+                                ("keylen =%d(Adapter->securitypriv.dot11PrivacyAlgrthm =%x )padapter->securitypriv.dot118021XGrpPrivacy(%x)\n",
+                                 key->KeyLength,
+                                 padapter->securitypriv.dot11PrivacyAlgrthm,
+                                 padapter->securitypriv.dot118021XGrpPrivacy));
+                       switch (key->KeyLength) {
+                       case 5:
+                               padapter->securitypriv.dot11PrivacyAlgrthm = _WEP40_;
+                               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
+                                        ("Adapter->securitypriv.dot11PrivacyAlgrthm = %x key->KeyLength =%u\n",
+                                         padapter->securitypriv.dot11PrivacyAlgrthm,
+                                         key->KeyLength));
+                               break;
+                       case 13:
+                               padapter->securitypriv.dot11PrivacyAlgrthm = _WEP104_;
+                               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
+                                        ("Adapter->securitypriv.dot11PrivacyAlgrthm = %x key->KeyLength =%u\n",
+                                         padapter->securitypriv.dot11PrivacyAlgrthm,
+                                         key->KeyLength));
+                               break;
+                       default:
+                               padapter->securitypriv.dot11PrivacyAlgrthm = _NO_PRIVACY_;
+                               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("Adapter->securitypriv.dot11PrivacyAlgrthm = %x key->KeyLength =%u\n", padapter->securitypriv.dot11PrivacyAlgrthm, key->KeyLength));
+                               break;
                        }
-
-                       encryptionalgo=padapter->securitypriv.dot11PrivacyAlgrthm;
-
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,(" Adapter->securitypriv.dot11PrivacyAlgrthm=%x\n", padapter->securitypriv.dot11PrivacyAlgrthm));
-
-               }
-               else
-               {
-                       encryptionalgo=padapter->securitypriv.dot118021XGrpPrivacy;
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("( Adapter->securitypriv.dot11PrivacyAlgrthm=%x  )encryptionalgo(%x)=padapter->securitypriv.dot118021XGrpPrivacy(%x)keylen=%d\n", padapter->securitypriv.dot11PrivacyAlgrthm,encryptionalgo,padapter->securitypriv.dot118021XGrpPrivacy,key->KeyLength));
-
+                       encryptionalgo = padapter->securitypriv.dot11PrivacyAlgrthm;
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, (" Adapter->securitypriv.dot11PrivacyAlgrthm =%x\n", padapter->securitypriv.dot11PrivacyAlgrthm));
+               } else {
+                       encryptionalgo = padapter->securitypriv.dot118021XGrpPrivacy;
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("(Adapter->securitypriv.dot11PrivacyAlgrthm =%x )encryptionalgo(%x) = padapter->securitypriv.dot118021XGrpPrivacy(%x)keylen =%d\n", padapter->securitypriv.dot11PrivacyAlgrthm, encryptionalgo, padapter->securitypriv.dot118021XGrpPrivacy, key->KeyLength));
                }
-
-               if((check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE)==true) && (IS_MAC_ADDRESS_BROADCAST(key->BSSID) == false)) {
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,(" IBSS but BSSID is not Broadcast Address.\n"));
-                       ret= _FAIL;
+               if ((check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE) == true) && (IS_MAC_ADDRESS_BROADCAST(key->BSSID) == false)) {
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, (" IBSS but BSSID is not Broadcast Address.\n"));
+                       ret = _FAIL;
                        goto exit;
                }
-
-               // Check key length for TKIP
-               if((encryptionalgo== _TKIP_) && (key->KeyLength != 32)) {
-
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,(" TKIP GTK KeyLength:%u != 32\n", key->KeyLength));
-                       ret= _FAIL;
+               /*  Check key length for TKIP */
+               if ((encryptionalgo == _TKIP_) && (key->KeyLength != 32)) {
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, (" TKIP GTK KeyLength:%u != 32\n", key->KeyLength));
+                       ret = _FAIL;
                        goto exit;
-
-               } else if(encryptionalgo== _AES_ && (key->KeyLength != 16 && key->KeyLength != 32) ) {
-
-                       // Check key length for AES
-                       // For NDTEST, we allow keylen=32 in this case. 2005.01.27, by rcnjko.
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("<=== SetInfo, OID_802_11_ADD_KEY: AES GTK KeyLength:%u != 16 or 32\n", key->KeyLength));
-                       ret= _FAIL;
+               } else if (encryptionalgo == _AES_ && (key->KeyLength != 16 && key->KeyLength != 32)) {
+                       /*  Check key length for AES */
+                       /*  For NDTEST, we allow keylen = 32 in this case. 2005.01.27, by rcnjko. */
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("<=== SetInfo, OID_802_11_ADD_KEY: AES GTK KeyLength:%u != 16 or 32\n", key->KeyLength));
+                       ret = _FAIL;
                        goto exit;
                }
-
-               // Change the key length for EAPPkt9x.vxd. Added by Annie, 2005-11-03.
-               if((encryptionalgo==  _AES_) && (key->KeyLength == 32) ) {
+               /*  Change the key length for EAPPkt9x.vxd. Added by Annie, 2005-11-03. */
+               if ((encryptionalgo ==  _AES_) && (key->KeyLength == 32)) {
                        key->KeyLength = 16;
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("AES key length changed: %u\n", key->KeyLength) );
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("AES key length changed: %u\n", key->KeyLength));
                }
-
-               if(key->KeyIndex & 0x8000000) {//error ??? 0x8000_0000
+               if (key->KeyIndex & 0x8000000) /* error ??? 0x8000_0000 */
                        bgrouptkey = true;
-               }
-
-               if((check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE)==true)&&(check_fwstate(&padapter->mlmepriv, _FW_LINKED)==true))
-               {
+               if ((check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE) == true) &&
+                   (check_fwstate(&padapter->mlmepriv, _FW_LINKED) == true))
                        bgrouptkey = true;
-               }
-
                bgroup = true;
-
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("------------------------------------------\n") );
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("[Group Key set]\n") );
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("------------------------------------------\n")) ;
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("key index: 0x%8x(0x%8x)\n", key->KeyIndex,(key->KeyIndex&0x3)));
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("key Length: %d\n", key->KeyLength)) ;
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("------------------------------------------\n"));
-
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("------------------------------------------\n"));
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("[Group Key set]\n"));
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("------------------------------------------\n"));
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("key index: 0x%8x(0x%8x)\n", key->KeyIndex, (key->KeyIndex&0x3)));
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("key Length: %d\n", key->KeyLength));
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("------------------------------------------\n"));
        }
-
-       // If WEP encryption algorithm, just call rtw_set_802_11_add_wep().
-       if((padapter->securitypriv.dot11AuthAlgrthm !=dot11AuthAlgrthm_8021X)&&(encryptionalgo== _WEP40_  || encryptionalgo== _WEP104_))
-       {
+       /*  If WEP encryption algorithm, just call rtw_set_802_11_add_wep(). */
+       if ((padapter->securitypriv.dot11AuthAlgrthm !=
+           dot11AuthAlgrthm_8021X) &&
+           (encryptionalgo == _WEP40_ || encryptionalgo == _WEP104_)) {
                u8 ret;
                u32 keyindex;
                u32 len = FIELD_OFFSET(NDIS_802_11_KEY, KeyMaterial) + key->KeyLength;
                NDIS_802_11_WEP *wep = &padapter->securitypriv.ndiswep;
 
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY: +++++ WEP key +++++\n"));
-
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("OID_802_11_ADD_KEY: +++++ WEP key +++++\n"));
                wep->Length = len;
                keyindex = key->KeyIndex&0x7fffffff;
-               wep->KeyIndex = keyindex ;
+               wep->KeyIndex = keyindex;
                wep->KeyLength = key->KeyLength;
-
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY:Before memcpy \n"));
-
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("OID_802_11_ADD_KEY:Before memcpy\n"));
                memcpy(wep->KeyMaterial, key->KeyMaterial, key->KeyLength);
                memcpy(&(padapter->securitypriv.dot11DefKey[keyindex].skey[0]), key->KeyMaterial, key->KeyLength);
-
-               padapter->securitypriv.dot11DefKeylen[keyindex]=key->KeyLength;
-               padapter->securitypriv.dot11PrivacyKeyIndex=keyindex;
-
+               padapter->securitypriv.dot11DefKeylen[keyindex] = key->KeyLength;
+               padapter->securitypriv.dot11PrivacyKeyIndex = keyindex;
                ret = rtw_set_802_11_add_wep(padapter, wep);
-
                goto exit;
-
        }
-
-       if(key->KeyIndex & 0x20000000){
-               // SetRSC
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("OID_802_11_ADD_KEY: +++++ SetRSC+++++\n"));
-               if(bgroup == true)
-               {
-                       NDIS_802_11_KEY_RSC keysrc=key->KeyRSC & 0x00FFFFFFFFFFFFULL;
+       if (key->KeyIndex & 0x20000000) {
+               /*  SetRSC */
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("OID_802_11_ADD_KEY: +++++ SetRSC+++++\n"));
+               if (bgroup == true) {
+                       NDIS_802_11_KEY_RSC keysrc = key->KeyRSC & 0x00FFFFFFFFFFFFULL;
                        memcpy(&padapter->securitypriv.dot11Grprxpn, &keysrc, 8);
-               }
-               else
-               {
-                       NDIS_802_11_KEY_RSC keysrc=key->KeyRSC & 0x00FFFFFFFFFFFFULL;
+               } else {
+                       NDIS_802_11_KEY_RSC keysrc = key->KeyRSC & 0x00FFFFFFFFFFFFULL;
                        memcpy(&padapter->securitypriv.dot11Grptxpn, &keysrc, 8);
                }
-
        }
-
-       // Indicate this key idx is used for TX
-       // Save the key in KeyMaterial
-       if(bgroup == true) // Group transmit key
-       {
+       /*  Indicate this key idx is used for TX */
+       /*  Save the key in KeyMaterial */
+       if (bgroup == true) { /*  Group transmit key */
                int res;
 
-               if(bgrouptkey == true)
-               {
-                       padapter->securitypriv.dot118021XGrpKeyid=(u8)key->KeyIndex;
-               }
-
-               if((key->KeyIndex&0x3) == 0){
+               if (bgrouptkey == true)
+                       padapter->securitypriv.dot118021XGrpKeyid = (u8)key->KeyIndex;
+               if ((key->KeyIndex&0x3) == 0) {
                        ret = _FAIL;
                        goto exit;
                }
-
                memset(&padapter->securitypriv.dot118021XGrpKey[(u8)((key->KeyIndex) & 0x03)], 0, 16);
                memset(&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) & 0x03)], 0, 16);
                memset(&padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)], 0, 16);
-
-               if((key->KeyIndex & 0x10000000))
-               {
+               if ((key->KeyIndex & 0x10000000)) {
                        memcpy(&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 16, 8);
                        memcpy(&padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 24, 8);
-
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n rtw_set_802_11_add_key:rx mic :0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n",
-                               padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[0],padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[1],
-                               padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[2],padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[3],
-                               padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[4],padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[5],
-                               padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[6],padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[7]));
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n rtw_set_802_11_add_key:set Group mic key!!!!!!!!\n"));
-
-               }
-               else
-               {
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
+                                ("\n rtw_set_802_11_add_key:rx mic :0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n",
+                                 padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[0],
+                                 padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[1],
+                                 padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[2],
+                                 padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[3],
+                                 padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[4],
+                                 padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[5],
+                                 padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[6],
+                                 padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[7]));
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("\n rtw_set_802_11_add_key:set Group mic key!!!!!!!!\n"));
+               } else {
                        memcpy(&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 24, 8);
                        memcpy(&padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 16, 8);
-
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n rtw_set_802_11_add_key:rx mic :0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n",
-                               padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[0],padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[1],
-                               padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[2],padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[3],
-                               padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[4],padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[5],
-                               padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[6],padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[7]));
-                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n rtw_set_802_11_add_key:set Group mic key!!!!!!!!\n"));
-
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
+                                ("\n rtw_set_802_11_add_key:rx mic :0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n",
+                                 padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[0],
+                                 padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[1],
+                                 padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[2],
+                                 padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[3],
+                                 padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[4],
+                                 padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[5],
+                                 padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)].skey[6],
+                                 padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex-1) & 0x03)].skey[7]));
+                       RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("\n rtw_set_802_11_add_key:set Group mic key!!!!!!!!\n"));
                }
-
-               //set group key by index
+               /* set group key by index */
                memcpy(&padapter->securitypriv.dot118021XGrpKey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial, key->KeyLength);
-
-               key->KeyIndex=key->KeyIndex & 0x03;
-
-               padapter->securitypriv.binstallGrpkey=true;
-
-               padapter->securitypriv.bcheck_grpkey=false;
-
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("reset group key"));
-
-               res=rtw_set_key(padapter,&padapter->securitypriv, key->KeyIndex, 1);
-
-               if(res==_FAIL)
-                       ret= _FAIL;
-
+               key->KeyIndex = key->KeyIndex & 0x03;
+               padapter->securitypriv.binstallGrpkey = true;
+               padapter->securitypriv.bcheck_grpkey = false;
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("reset group key"));
+               res = rtw_set_key(padapter, &padapter->securitypriv, key->KeyIndex, 1);
+               if (res == _FAIL)
+                       ret = _FAIL;
                goto exit;
-
-       }
-       else // Pairwise Key
-       {
+       } else { /*  Pairwise Key */
                u8 res;
 
-               pbssid=get_bssid(&padapter->mlmepriv);
-               stainfo=rtw_get_stainfo(&padapter->stapriv , pbssid );
-
-               if(stainfo!=NULL)
-               {
-                       memset( &stainfo->dot118021x_UncstKey, 0, 16);// clear keybuffer
+               pbssid = get_bssid(&padapter->mlmepriv);
+               stainfo = rtw_get_stainfo(&padapter->stapriv , pbssid);
 
+               if (stainfo != NULL) {
+                       memset(&stainfo->dot118021x_UncstKey, 0, 16);/*  clear keybuffer */
                        memcpy(&stainfo->dot118021x_UncstKey, key->KeyMaterial, 16);
-
-                       if(encryptionalgo== _TKIP_)
-                       {
-                               padapter->securitypriv.busetkipkey=false;
-
-                               //_set_timer(&padapter->securitypriv.tkip_timer, 50);
-
-                               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n ==========_set_timer\n"));
-
-                               // if TKIP, save the Receive/Transmit MIC key in KeyMaterial[128-255]
-                               if((key->KeyIndex & 0x10000000)){
+                       if (encryptionalgo == _TKIP_) {
+                               padapter->securitypriv.busetkipkey = false;
+                               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("\n ========== _set_timer\n"));
+                               /*  if TKIP, save the Receive/Transmit MIC key in KeyMaterial[128-255] */
+                               if ((key->KeyIndex & 0x10000000)) {
                                        memcpy(&stainfo->dot11tkiptxmickey, key->KeyMaterial + 16, 8);
                                        memcpy(&stainfo->dot11tkiprxmickey, key->KeyMaterial + 24, 8);
-
                                } else {
                                        memcpy(&stainfo->dot11tkiptxmickey, key->KeyMaterial + 24, 8);
                                        memcpy(&stainfo->dot11tkiprxmickey, key->KeyMaterial + 16, 8);
-
                                }
-
-                       }
-                       else if(encryptionalgo == _AES_)
-                       {
-
                        }
-
-
-                       //Set key to CAM through H2C command
-                       if(bgrouptkey)//never go to here
-                       {
-                               res=rtw_setstakey_cmd(padapter, (unsigned char *)stainfo, false);
-                               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n rtw_set_802_11_add_key:rtw_setstakey_cmd(group)\n"));
-                       }
-                       else{
-                               res=rtw_setstakey_cmd(padapter, (unsigned char *)stainfo, true);
-                               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("\n rtw_set_802_11_add_key:rtw_setstakey_cmd(unicast)\n"));
+                       /* Set key to CAM through H2C command */
+                       if (bgrouptkey) {/* never go to here */
+                               res = rtw_setstakey_cmd(padapter, (unsigned char *)stainfo, false);
+                               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("\n rtw_set_802_11_add_key:rtw_setstakey_cmd(group)\n"));
+                       } else {
+                               res = rtw_setstakey_cmd(padapter, (unsigned char *)stainfo, true);
+                               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("\n rtw_set_802_11_add_key:rtw_setstakey_cmd(unicast)\n"));
                        }
-
-                       if(res ==false)
-                               ret= _FAIL;
-
+                       if (res == false)
+                               ret = _FAIL;
                }
-
        }
 
 exit:
@@ -1113,57 +955,44 @@ _func_exit_;
        return ret;
 }
 
-u8 rtw_set_802_11_remove_key(_adapter* padapter, NDIS_802_11_REMOVE_KEY *key){
-
-       uint                            encryptionalgo;
-       u8 * pbssid;
+u8 rtw_set_802_11_remove_key(_adapter *padapter, NDIS_802_11_REMOVE_KEY *key)
+{
+       uint encryptionalgo;
+       u8 *pbssid;
        struct sta_info *stainfo;
-       u8      bgroup = (key->KeyIndex & 0x4000000) > 0 ? false: true;
-       u8      keyIndex = (u8)key->KeyIndex & 0x03;
-       u8      ret=_SUCCESS;
+       u8 bgroup = (key->KeyIndex & 0x4000000) > 0 ? false : true;
+       u8 keyIndex = (u8)key->KeyIndex & 0x03;
+       u8 ret = _SUCCESS;
 
 _func_enter_;
-
        if ((key->KeyIndex & 0xbffffffc) > 0) {
-               ret=_FAIL;
+               ret = _FAIL;
                goto exit;
        }
-
        if (bgroup == true) {
-               encryptionalgo= padapter->securitypriv.dot118021XGrpPrivacy;
-               // clear group key by index
-               //NdisZeroMemory(Adapter->MgntInfo.SecurityInfo.KeyBuf[keyIndex], MAX_WEP_KEY_LEN);
-               //Adapter->MgntInfo.SecurityInfo.KeyLen[keyIndex] = 0;
-
+               encryptionalgo = padapter->securitypriv.dot118021XGrpPrivacy;
+               /*  clear group key by index */
                memset(&padapter->securitypriv.dot118021XGrpKey[keyIndex], 0, 16);
-
-               //! \todo Send a H2C Command to Firmware for removing this Key in CAM Entry.
-
+               /*  \todo Send a H2C Command to Firmware for removing this Key in CAM Entry. */
        } else {
+               pbssid = get_bssid(&padapter->mlmepriv);
+               stainfo = rtw_get_stainfo(&padapter->stapriv , pbssid);
+               if (stainfo != NULL) {
+                       encryptionalgo = stainfo->dot118021XPrivacy;
 
-               pbssid=get_bssid(&padapter->mlmepriv);
-               stainfo=rtw_get_stainfo(&padapter->stapriv , pbssid );
-               if(stainfo !=NULL){
-                       encryptionalgo=stainfo->dot118021XPrivacy;
-
-               // clear key by BSSID
+               /*  clear key by BSSID */
                memset(&stainfo->dot118021x_UncstKey, 0, 16);
 
-               //! \todo Send a H2C Command to Firmware for disable this Key in CAM Entry.
+               /*  \todo Send a H2C Command to Firmware for disable this Key in CAM Entry. */
 
-               }
-               else{
-                       ret= _FAIL;
+               } else {
+                       ret = _FAIL;
                        goto exit;
                }
        }
-
 exit:
-
 _func_exit_;
-
        return true;
-
 }
 
 /*
@@ -1176,7 +1005,7 @@ u16 rtw_get_cur_max_rate(_adapter *adapter)
 {
        int i = 0;
        u8 *p;
-       u16 rate = 0, max_rate = 0, ht_cap=false;
+       u16 rate = 0, max_rate = 0, ht_cap = false;
        u32 ht_ielen = 0;
        struct mlme_ext_priv    *pmlmeext = &adapter->mlmeextpriv;
        struct mlme_ext_info    *pmlmeinfo = &(pmlmeext->mlmext_info);
@@ -1184,47 +1013,44 @@ u16 rtw_get_cur_max_rate(_adapter *adapter)
        struct mlme_priv        *pmlmepriv = &adapter->mlmepriv;
        WLAN_BSSID_EX  *pcur_bss = &pmlmepriv->cur_network.network;
        struct rtw_ieee80211_ht_cap *pht_capie;
-       u8      bw_40MHz=0, short_GI_20=0, short_GI_40=0;
-       u16     mcs_rate=0;
+       u8      bw_40MHz = 0, short_GI_20 = 0, short_GI_40 = 0;
+       u16     mcs_rate = 0;
        u8      rf_type = 0;
        struct registry_priv *pregpriv = &adapter->registrypriv;
 
 #ifdef CONFIG_MP_INCLUDED
-       if (adapter->registrypriv.mp_mode == 1)
-       {
+       if (adapter->registrypriv.mp_mode == 1) {
                if (check_fwstate(pmlmepriv, WIFI_MP_STATE) == true)
                return 0;
        }
 #endif
 
-       if((check_fwstate(pmlmepriv, _FW_LINKED) != true)
-               && (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) != true))
+       if ((check_fwstate(pmlmepriv, _FW_LINKED) != true) &&
+           (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) != true))
                return 0;
 
        p = rtw_get_ie(&pcur_bss->IEs[12], _HT_CAPABILITY_IE_, &ht_ielen, pcur_bss->IELength-12);
-       if(p && ht_ielen>0) {
+       if (p && ht_ielen > 0) {
                ht_cap = true;
                pht_capie = (struct rtw_ieee80211_ht_cap *)(p+2);
 
                memcpy(&mcs_rate , pht_capie->supp_mcs_set, 2);
 
-               //bw_40MHz = (pht_capie->cap_info&IEEE80211_HT_CAP_SUP_WIDTH) ? 1:0;
-               //cur_bwmod is updated by beacon, pmlmeinfo is updated by association response
-               bw_40MHz = (pmlmeext->cur_bwmode && (HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH & pmlmeinfo->HT_info.infos[0])) ? 1:0;
+               /* cur_bwmod is updated by beacon, pmlmeinfo is updated by association response */
+               bw_40MHz = (pmlmeext->cur_bwmode && (HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH & pmlmeinfo->HT_info.infos[0])) ? 1 : 0;
 
-               //short_GI = (pht_capie->cap_info&(IEEE80211_HT_CAP_SGI_20|IEEE80211_HT_CAP_SGI_40)) ? 1:0;
-               short_GI_20 = (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info&IEEE80211_HT_CAP_SGI_20) ? 1:0;
-               short_GI_40 = (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info&IEEE80211_HT_CAP_SGI_40) ? 1:0;
+               short_GI_20 = (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info&IEEE80211_HT_CAP_SGI_20) ? 1 : 0;
+               short_GI_40 = (pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info&IEEE80211_HT_CAP_SGI_40) ? 1 : 0;
        }
 
-       while( (pcur_bss->SupportedRates[i]!=0) && (pcur_bss->SupportedRates[i]!=0xFF)) {
+       while ((pcur_bss->SupportedRates[i] != 0) && (pcur_bss->SupportedRates[i] != 0xFF)) {
                rate = pcur_bss->SupportedRates[i]&0x7F;
-               if(rate>max_rate)
+               if (rate > max_rate)
                        max_rate = rate;
                i++;
        }
 
-       if(ht_cap == true) {
+       if (ht_cap == true) {
 #ifdef CONFIG_80211N_HT
                rtw_hal_get_hwreg(adapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type));
                max_rate = rtw_mcs_rate(
@@ -1234,7 +1060,7 @@ u16 rtw_get_cur_max_rate(_adapter *adapter)
                        short_GI_40,
                        pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate
                );
-#endif //CONFIG_80211N_HT
+#endif /* CONFIG_80211N_HT */
        } else {
                max_rate = max_rate*10/2;
        }
@@ -1250,7 +1076,7 @@ u16 rtw_get_cur_max_rate(_adapter *adapter)
 */
 int rtw_set_scan_mode(_adapter *adapter, RT_SCAN_TYPE scan_mode)
 {
-       if(scan_mode != SCAN_ACTIVE && scan_mode != SCAN_PASSIVE)
+       if (scan_mode != SCAN_ACTIVE && scan_mode != SCAN_PASSIVE)
                return _FAIL;
 
        adapter->mlmepriv.scan_mode = scan_mode;
@@ -1270,7 +1096,7 @@ int rtw_set_channel_plan(_adapter *adapter, u8 channel_plan)
        struct registry_priv *pregistrypriv = &adapter->registrypriv;
        struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
 
-       //handle by cmd_thread to sync with scan operation
+       /* handle by cmd_thread to sync with scan operation */
        return rtw_set_chplan_cmd(adapter, channel_plan, 1);
 }
 
@@ -1285,16 +1111,16 @@ int rtw_set_country(_adapter *adapter, const char *country_code)
 {
        int channel_plan = RT_CHANNEL_DOMAIN_FCC;
 
-       //TODO: should have a table to match country code and RT_CHANNEL_DOMAIN
-       //TODO: should consider 2-character and 3-character counter code
-       if(0 == strcmp(country_code, "US"))
+       /* TODO: should have a table to match country code and RT_CHANNEL_DOMAIN */
+       /* TODO: should consider 2-character and 3-character counter code */
+       if (0 == strcmp(country_code, "US"))
                channel_plan = RT_CHANNEL_DOMAIN_FCC;
-       else if(0 == strcmp(country_code, "EU"))
+       else if (0 == strcmp(country_code, "EU"))
                channel_plan = RT_CHANNEL_DOMAIN_ETSI;
-       else if(0 == strcmp(country_code, "JP"))
+       else if (0 == strcmp(country_code, "JP"))
                channel_plan = RT_CHANNEL_DOMAIN_MKK;
        else
-               DBG_871X("%s unknown country_code:%s\n", __FUNCTION__, country_code);
+               DBG_871X("%s unknown country_code:%s\n", __func__, country_code);
 
        return rtw_set_channel_plan(adapter, channel_plan);
 }