OSDN Git Service

staging: rtl8723bs: update to the latest driver
[android-x86/kernel.git] / drivers / staging / rtl8723bs / core / rtw_ioctl_set.c
index bce6034..7bf8f8c 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_IOCTL_SET_C_
 
 #include <drv_types.h>
-
-
-extern void indicate_wx_scan_complete_event(_adapter *padapter);
+#include <rtw_debug.h>
 
 #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_bssid(u8 *bssid)
@@ -45,55 +38,46 @@ u8 rtw_validate_bssid(u8 *bssid)
        return ret;
 }
 
-u8 rtw_validate_ssid(NDIS_802_11_SSID *ssid)
+u8 rtw_validate_ssid(struct ndis_802_11_ssid *ssid)
 {
-       u8       i;
-       u8      ret=true;
-
-_func_enter_;
+       u8 ret =true;
 
        if (ssid->SsidLength > 32) {
                RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid length >32\n"));
-               ret= false;
+               ret = false;
                goto exit;
        }
 
 #ifdef CONFIG_VALIDATE_SSID
-       for(i = 0; i < ssid->SsidLength; i++)
+       for (i = 0; i < ssid->SsidLength; i++)
        {
-               //wifi, printable ascii code must be supported
-               if(!( (ssid->Ssid[i] >= 0x20) && (ssid->Ssid[i] <= 0x7e) )){
+               /* 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;
                }
        }
 #endif /* CONFIG_VALIDATE_SSID */
 
 exit:
-
-_func_exit_;
-
        return ret;
 }
 
-u8 rtw_do_join(_adapter * padapter);
-u8 rtw_do_join(_adapter * padapter)
+u8 rtw_do_join(struct adapter *padapter);
+u8 rtw_do_join(struct adapter *padapter)
 {
-       _irqL   irqL;
-       _list   *plist, *phead;
-       u8* pibss = NULL;
-       struct  mlme_priv       *pmlmepriv = &(padapter->mlmepriv);
-       _queue  *queue  = &(pmlmepriv->scanned_queue);
-       u8 ret=_SUCCESS;
-
-_func_enter_;
+       struct list_head        *plist, *phead;
+       u8 *pibss = NULL;
+       struct  mlme_priv *pmlmepriv = &(padapter->mlmepriv);
+       struct __queue  *queue  = &(pmlmepriv->scanned_queue);
+       u8 ret = _SUCCESS;
 
        spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
        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;
 
@@ -103,23 +87,23 @@ _func_enter_;
 
        pmlmepriv->to_join = true;
 
-       if(list_empty(&queue->queue))
+       if (list_empty(&queue->queue))
        {
                spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));
                _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
+               /* 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
                        || rtw_to_roam(padapter) > 0
                )
                {
-                       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, NULL, 0)) ) {
+                       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, NULL, 0))) {
                                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
@@ -134,58 +118,58 @@ _func_enter_;
        {
                int select_ret;
                spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));
-               if((select_ret=rtw_select_and_join_from_scanned_queue(pmlmepriv))==_SUCCESS)
+               if ((select_ret =rtw_select_and_join_from_scanned_queue(pmlmepriv)) == _SUCCESS)
                {
                        pmlmepriv->to_join = false;
                        _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT);
                }
                else
                {
-                       if(check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)==true)
+                       if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) ==true)
                        {
-                               // submit createbss_cmd to change to a ADHOC_MASTER
+                               /*  submit createbss_cmd to change to a ADHOC_MASTER */
 
-                               //pmlmepriv->lock has been acquired by caller...
-                               WLAN_BSSID_EX    *pdev_network = &(padapter->registrypriv.dev_network);
+                               /* pmlmepriv->lock has been acquired by caller... */
+                               struct wlan_bssid_ex    *pdev_network = &(padapter->registrypriv.dev_network);
 
                                pmlmepriv->fw_state = WIFI_ADHOC_MASTER_STATE;
 
                                pibss = padapter->registrypriv.dev_network.MacAddress;
 
-                               memset(&pdev_network->Ssid, 0, sizeof(NDIS_802_11_SSID));
-                               memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(NDIS_802_11_SSID));
+                               memset(&pdev_network->Ssid, 0, sizeof(struct ndis_802_11_ssid));
+                               memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndis_802_11_ssid));
 
                                rtw_update_registrypriv_dev_network(padapter);
 
                                rtw_generate_random_ibss(pibss);
 
-                               if(rtw_createbss_cmd(padapter)!=_SUCCESS)
+                               if (rtw_createbss_cmd(padapter)!= _SUCCESS)
                                {
-                                       RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("***Error=>do_goin: rtw_createbss_cmd status FAIL*** \n "));
+                                       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 "));
+                               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
+                               /*  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
                                        || rtw_to_roam(padapter) > 0
                                )
                                {
-                                       //DBG_871X("rtw_do_join() when   no desired bss in scanning queue \n");
-                                       if( _SUCCESS!=(ret=rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL, 0)) ){
+                                       /* DBG_871X("rtw_do_join() when   no desired bss in scanning queue\n"); */
+                                       if (_SUCCESS!=(ret =rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL, 0))) {
                                                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
@@ -200,25 +184,19 @@ _func_enter_;
        }
 
 exit:
-
-_func_exit_;
-
        return ret;
 }
 
-u8 rtw_set_802_11_bssid(_adapter* padapter, u8 *bssid)
+u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid)
 {
-       _irqL irqL;
-       u8 status=_SUCCESS;
+       u8 status = _SUCCESS;
 
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 
-_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;
@@ -227,7 +205,7 @@ _func_enter_;
        spin_lock_bh(&pmlmepriv->lock);
 
 
-       DBG_871X("Set BSSID under fw_state=0x%08x\n", get_fwstate(pmlmepriv));
+       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) {
@@ -241,11 +219,11 @@ _func_enter_;
                if (!memcmp(&pmlmepriv->cur_network.network.MacAddress, bssid, ETH_ALEN))
                {
                        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, 0, true);
 
@@ -267,9 +245,9 @@ handle_tkip_countermeasure:
                goto release_mlme_lock;
        }
 
-       memset(&pmlmepriv->assoc_ssid, 0, sizeof(NDIS_802_11_SSID));
+       memset(&pmlmepriv->assoc_ssid, 0, sizeof(struct ndis_802_11_ssid));
        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) {
                pmlmepriv->to_join = true;
@@ -283,37 +261,31 @@ release_mlme_lock:
 
 exit:
        RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
-               ("rtw_set_802_11_bssid: status=%d\n", status));
-
-_func_exit_;
+               ("rtw_set_802_11_bssid: status =%d\n", status));
 
        return status;
 }
 
-u8 rtw_set_802_11_ssid(_adapter* padapter, NDIS_802_11_SSID *ssid)
+u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)
 {
-       _irqL 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",
+       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;
        }
 
        spin_lock_bh(&pmlmepriv->lock);
 
-       DBG_871X("Set SSID under fw_state=0x%08x\n", get_fwstate(pmlmepriv));
+       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) {
@@ -328,15 +300,15 @@ _func_enter_;
                if ((pmlmepriv->assoc_ssid.SsidLength == ssid->SsidLength) &&
                    (!memcmp(&pmlmepriv->assoc_ssid.Ssid, ssid->Ssid, ssid->SsidLength)))
                {
-                       if((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == false))
+                       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 (rtw_is_same_ibss(padapter, pnetwork) == false)
                                {
-                                       //if in WIFI_ADHOC_MASTER_STATE | WIFI_ADHOC_STATE, create bss or rejoin again
+                                       /* if in WIFI_ADHOC_MASTER_STATE | WIFI_ADHOC_STATE, create bss or rejoin again */
                                        rtw_disassoc_cmd(padapter, 0, true);
 
                                        if (check_fwstate(pmlmepriv, _FW_LINKED) == true)
@@ -351,7 +323,7 @@ _func_enter_;
                                }
                                else
                                {
-                                       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 {
@@ -360,9 +332,9 @@ _func_enter_;
                }
                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));
+                       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, 0, true);
 
@@ -389,8 +361,8 @@ handle_tkip_countermeasure:
                goto release_mlme_lock;
        }
 
-       memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(NDIS_802_11_SSID));
-       pmlmepriv->assoc_by_bssid=false;
+       memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(struct ndis_802_11_ssid));
+       pmlmepriv->assoc_by_bssid =false;
 
        if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) {
                pmlmepriv->to_join = true;
@@ -404,25 +376,18 @@ release_mlme_lock:
 
 exit:
        RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_,
-               ("-rtw_set_802_11_ssid: status=%d\n", status));
-
-_func_exit_;
+               ("-rtw_set_802_11_ssid: status =%d\n", status));
 
        return status;
-
 }
 
-u8 rtw_set_802_11_connect(_adapter* padapter, u8 *bssid, NDIS_802_11_SSID *ssid)
+u8 rtw_set_802_11_connect(struct adapter *padapter, u8 *bssid, struct ndis_802_11_ssid *ssid)
 {
-       _irqL irqL;
        u8 status = _SUCCESS;
-       u32 cur_time = 0;
        bool bssid_valid = true;
        bool ssid_valid = true;
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 
-_func_enter_;
-
        if (!ssid || rtw_validate_ssid(ssid) == false)
                ssid_valid = false;
 
@@ -436,16 +401,16 @@ _func_enter_;
                goto exit;
        }
 
-       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;
        }
 
        spin_lock_bh(&pmlmepriv->lock);
 
-       DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT"  fw_state=0x%08x\n",
+       DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT"  fw_state = 0x%08x\n",
                FUNC_ADPT_ARG(padapter), get_fwstate(pmlmepriv));
 
        if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) {
@@ -461,9 +426,9 @@ handle_tkip_countermeasure:
        }
 
        if (ssid && ssid_valid)
-               memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(NDIS_802_11_SSID));
+               memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(struct ndis_802_11_ssid));
        else
-               memset(&pmlmepriv->assoc_ssid, 0, sizeof(NDIS_802_11_SSID));
+               memset(&pmlmepriv->assoc_ssid, 0, sizeof(struct ndis_802_11_ssid));
 
        if (bssid && bssid_valid) {
                memcpy(&pmlmepriv->assoc_bssid, bssid, ETH_ALEN);
@@ -483,34 +448,28 @@ release_mlme_lock:
        spin_unlock_bh(&pmlmepriv->lock);
 
 exit:
-
-_func_exit_;
-
        return status;
 }
 
-u8 rtw_set_802_11_infrastructure_mode(_adapter* padapter,
-       NDIS_802_11_NETWORK_INFRASTRUCTURE networktype)
+u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,
+       enum NDIS_802_11_NETWORK_INFRASTRUCTURE networktype)
 {
-       _irqL irqL;
-       struct  mlme_priv       *pmlmepriv = &padapter->mlmepriv;
+       struct  mlme_priv *pmlmepriv = &padapter->mlmepriv;
        struct  wlan_network    *cur_network = &pmlmepriv->cur_network;
-       NDIS_802_11_NETWORK_INFRASTRUCTURE* pold_state = &(cur_network->network.InfrastructureMode);
+       enum 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)
        {
-               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!"));
+               /* DBG_871X("change mode, old_mode =%d, new_mode =%d, fw_state = 0x%x\n", *pold_state, networktype, get_fwstate(pmlmepriv)); */
 
-               if(*pold_state==Ndis802_11APMode)
+               if (*pold_state ==Ndis802_11APMode)
                {
-                       //change to other mode from Ndis802_11APMode
+                       /* change to other mode from Ndis802_11APMode */
                        cur_network->join_res = -1;
 
                        stop_ap_mode(padapter);
@@ -518,18 +477,18 @@ _func_enter_;
 
                spin_lock_bh(&pmlmepriv->lock);
 
-               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, 0, true);
 
-               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 ((*pold_state == Ndis802_11Infrastructure) ||(*pold_state == Ndis802_11IBSS))
               {
-                       if(check_fwstate(pmlmepriv, _FW_LINKED) == true)
+                       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
+                               rtw_indicate_disconnect(padapter); /* will clr Linked_state; before this function, we must have chked whether  issue dis-assoc_cmd or not */
                        }
               }
 
@@ -537,7 +496,7 @@ _func_enter_;
 
                _clr_fwstate_(pmlmepriv, ~WIFI_NULL_STATE);
 
-               switch(networktype)
+               switch (networktype)
                {
                        case Ndis802_11IBSS:
                                set_fwstate(pmlmepriv, WIFI_ADHOC_STATE);
@@ -550,7 +509,7 @@ _func_enter_;
                        case Ndis802_11APMode:
                                set_fwstate(pmlmepriv, WIFI_AP_STATE);
                                start_ap_mode(padapter);
-                               //rtw_indicate_connect(padapter);
+                               /* rtw_indicate_connect(padapter); */
 
                                break;
 
@@ -559,79 +518,68 @@ _func_enter_;
                                break;
                }
 
-               //SecClearAllKeys(adapter);
+               /* SecClearAllKeys(adapter); */
 
-               //RT_TRACE(COMP_OID_SET, DBG_LOUD, ("set_infrastructure: fw_state:%x after changing mode\n",
-               //                                                                      get_fwstate(pmlmepriv) ));
+               /* RT_TRACE(COMP_OID_SET, DBG_LOUD, ("set_infrastructure: fw_state:%x after changing mode\n", */
+               /*                                                                      get_fwstate(pmlmepriv))); */
 
                spin_unlock_bh(&pmlmepriv->lock);
        }
-
-_func_exit_;
-
        return true;
 }
 
 
-u8 rtw_set_802_11_disassociate(_adapter *padapter)
+u8 rtw_set_802_11_disassociate(struct adapter *padapter)
 {
-       _irqL irqL;
        struct mlme_priv * pmlmepriv = &padapter->mlmepriv;
 
-_func_enter_;
-
        spin_lock_bh(&pmlmepriv->lock);
 
        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"));
+               RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, ("MgntActrtw_set_802_11_disassociate: rtw_indicate_disconnect\n"));
 
                rtw_disassoc_cmd(padapter, 0, true);
                rtw_indicate_disconnect(padapter);
-               //modify for CONFIG_IEEE80211W, none 11w can use it
+               /* modify for CONFIG_IEEE80211W, none 11w can use it */
                rtw_free_assoc_resources_cmd(padapter);
                if (_FAIL == rtw_pwr_wakeup(padapter))
-                       DBG_871X("%s(): rtw_pwr_wakeup fail !!!\n",__FUNCTION__);
+                       DBG_871X("%s(): rtw_pwr_wakeup fail !!!\n", __func__);
        }
 
        spin_unlock_bh(&pmlmepriv->lock);
 
-_func_exit_;
-
        return true;
 }
 
-u8 rtw_set_802_11_bssid_list_scan(_adapter* padapter, NDIS_802_11_SSID *pssid, int ssid_max_num)
+u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_ssid *pssid, int ssid_max_num)
 {
-       _irqL   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)));
+               /*  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 {
                if (rtw_is_scan_deny(padapter)) {
@@ -648,121 +596,110 @@ _func_enter_;
        }
 exit:
 
-_func_exit_;
-
        return res;
 }
 
-u8 rtw_set_802_11_authentication_mode(_adapter* padapter, NDIS_802_11_AUTHENTICATION_MODE authmode)
+u8 rtw_set_802_11_authentication_mode(struct adapter *padapter, enum NDIS_802_11_AUTHENTICATION_MODE authmode)
 {
        struct security_priv *psecuritypriv = &padapter->securitypriv;
        int res;
        u8 ret;
 
-_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;
+       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;
-
-_func_exit_;
+               ret =false;
 
        return ret;
 }
 
-u8 rtw_set_802_11_add_wep(_adapter* padapter, NDIS_802_11_WEP *wep){
+u8 rtw_set_802_11_add_wep(struct adapter *padapter, struct ndis_802_11_wep *wep) {
 
-       u8              bdefaultkey;
-       u8              btransmitkey;
-       sint            keyid,res;
-       struct security_priv* psecuritypriv=&(padapter->securitypriv);
-       u8              ret=_SUCCESS;
+       u8 bdefaultkey;
+       u8 btransmitkey;
+       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)
+       if (keyid>=4)
        {
-               RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_err_,("MgntActrtw_set_802_11_add_wep:keyid>4=>fail\n"));
-               ret=false;
+               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)
+       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"));
+                       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"));
+                       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"));
+                       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));
+       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);
+       memcpy(&(psecuritypriv->dot11DefKey[keyid].skey[0]),&(wep->KeyMaterial), wep->KeyLength);
 
        psecuritypriv->dot11DefKeylen[keyid]=wep->KeyLength;
 
-       psecuritypriv->dot11PrivacyKeyIndex=keyid;
+       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],
+       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, true);
+       res =rtw_set_key(padapter, psecuritypriv, keyid, 1, true);
 
-       if(res==_FAIL)
-               ret= false;
+       if (res == _FAIL)
+               ret = false;
 exit:
 
-_func_exit_;
-
        return ret;
-
 }
 
 /*
 * rtw_get_cur_max_rate -
-* @adapter: pointer to _adapter structure
+* @adapter: pointer to struct adapter structure
 *
 * Return 0 or 100Kbps
 */
-u16 rtw_get_cur_max_rate(_adapter *adapter)
+u16 rtw_get_cur_max_rate(struct adapter *adapter)
 {
        int     i = 0;
-       u16     rate = 0, max_rate = 0;
-       struct mlme_priv        *pmlmepriv = &adapter->mlmepriv;
-       WLAN_BSSID_EX   *pcur_bss = &pmlmepriv->cur_network.network;
+       u16 rate = 0, max_rate = 0;
+       struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
+       struct wlan_bssid_ex    *pcur_bss = &pmlmepriv->cur_network.network;
        struct sta_info *psta = NULL;
-       u8      short_GI=0;
-       u8      rf_type = 0;
+       u8 short_GI = 0;
+       u8 rf_type = 0;
 
-       if((check_fwstate(pmlmepriv, _FW_LINKED) != true)
+       if ((check_fwstate(pmlmepriv, _FW_LINKED) != true)
                && (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) != true))
                return 0;
 
@@ -784,10 +721,10 @@ u16 rtw_get_cur_max_rate(_adapter *adapter)
        }
        else
        {
-               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++;
                }