struct wlan_bssid_ex            *pdev_network = &padapter->registrypriv.dev_network;
        u8 res = _SUCCESS;
 
-       if (pmlmepriv->assoc_ssid.SsidLength == 0) {
+       if (pmlmepriv->assoc_ssid.SsidLength == 0)
                RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, (" createbss for Any SSid:%s\n", pmlmepriv->assoc_ssid.Ssid));
-       } else {
+       else
                RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, (" createbss for SSid:%s\n", pmlmepriv->assoc_ssid.Ssid));
-       }
 
        pcmd = rtw_zmalloc(sizeof(struct cmd_obj));
        if (pcmd == NULL) {
        u32 tmp_len;
        u8 *ptmp = NULL;
 
-       if (pmlmepriv->assoc_ssid.SsidLength == 0) {
+       if (pmlmepriv->assoc_ssid.SsidLength == 0)
                RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("+Join cmd: Any SSid\n"));
-       } else {
+       else
                RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+Join cmd: SSid =[%s]\n", pmlmepriv->assoc_ssid.Ssid));
-       }
 
        pcmd = rtw_zmalloc(sizeof(struct cmd_obj));
        if (pcmd == NULL) {
 
        psecuritypriv->authenticator_ie[0] = (unsigned char)psecnetwork->IELength;
 
-       if ((psecnetwork->IELength-12) < (256-1)) {
+       if ((psecnetwork->IELength-12) < (256-1))
                memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->IEs[12], psecnetwork->IELength-12);
-       } else {
+       else
                memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->IEs[12], (256-1));
-       }
 
        psecnetwork->IELength = 0;
        /*  Added by Albert 2009/02/18 */
 
        memcpy(psetstakey_para->addr, sta->hwaddr, ETH_ALEN);
 
-       if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) {
+       if (check_fwstate(pmlmepriv, WIFI_STATION_STATE))
                psetstakey_para->algorithm = (unsigned char) psecuritypriv->dot11PrivacyAlgrthm;
-       } else {
+       else
                GET_ENCRY_ALGO(psecuritypriv, sta, psetstakey_para->algorithm, false);
-       }
 
-       if (unicast_key == true) {
+       if (unicast_key == true)
                memcpy(&psetstakey_para->key, &sta->dot118021x_UncstKey, 16);
-       } else {
+       else
                memcpy(&psetstakey_para->key, &psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey, 16);
-       }
 
        /* jeff: set this because at least sw key is ready */
        padapter->securitypriv.busetkipkey = true;