|
@@ -432,13 +432,11 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid,
|
|
|
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
|
|
|
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
|
|
|
|
|
- if (check_fwstate(pmlmepriv, _FW_LINKED) == true) {
|
|
|
+ if (check_fwstate(pmlmepriv, _FW_LINKED) == true)
|
|
|
rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SCAN, 1);
|
|
|
- }
|
|
|
|
|
|
- if (check_fwstate(pmlmepriv, _FW_LINKED) == true) {
|
|
|
+ if (check_fwstate(pmlmepriv, _FW_LINKED) == true)
|
|
|
p2p_ps_wk_cmd(padapter, P2P_PS_SCAN, 1);
|
|
|
- }
|
|
|
|
|
|
ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
|
|
|
if (ph2c == NULL)
|
|
@@ -844,11 +842,10 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork)
|
|
|
|
|
|
rtw_led_control(padapter, LED_CTL_START_TO_LINK);
|
|
|
|
|
|
- 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 = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
|
|
|
if (pcmd == NULL) {
|
|
@@ -894,11 +891,10 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork)
|
|
|
|
|
|
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 */
|