Commit 50f2ea8b authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: fix comparsions to true 



Use if(x) instead of if(x == true).

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 116bcfdf

drivers/staging/rtl8188eu/core/rtw_ioctl_set.c

+13 −13
Original line number Original line Diff line number Diff line
@@ -67,7 +67,7 @@ u8 rtw_do_join(struct adapter *padapter) 
			mod_timer(&pmlmepriv->assoc_timer,

			mod_timer(&pmlmepriv->assoc_timer,

				  jiffies + msecs_to_jiffies(MAX_JOIN_TIMEOUT));

				  jiffies + msecs_to_jiffies(MAX_JOIN_TIMEOUT));

		} else {

		} else {

			if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true) {

			if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {

				/*  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... */

				/* pmlmepriv->lock has been acquired by caller... */
@@ -136,7 +136,7 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid) 
	spin_lock_bh(&pmlmepriv->lock);

	spin_lock_bh(&pmlmepriv->lock);





	DBG_88E("Set BSSID under fw_state = 0x%08x\n", get_fwstate(pmlmepriv));

	DBG_88E("Set BSSID under fw_state = 0x%08x\n", get_fwstate(pmlmepriv));

	if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true)

	if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY))

		goto handle_tkip_countermeasure;

		goto handle_tkip_countermeasure;

	else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING))

	else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING))

		goto release_mlme_lock;

		goto release_mlme_lock;
@@ -154,12 +154,12 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid) 




			rtw_disassoc_cmd(padapter, 0, true);

			rtw_disassoc_cmd(padapter, 0, true);





			if (check_fwstate(pmlmepriv, _FW_LINKED) == true)

			if (check_fwstate(pmlmepriv, _FW_LINKED))

				rtw_indicate_disconnect(padapter);

				rtw_indicate_disconnect(padapter);





			rtw_free_assoc_resources(padapter);

			rtw_free_assoc_resources(padapter);





			if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true)) {

			if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {

				_clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE);

				_clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE);

				set_fwstate(pmlmepriv, WIFI_ADHOC_STATE);

				set_fwstate(pmlmepriv, WIFI_ADHOC_STATE);

			}

			}
@@ -220,9 +220,9 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid) 
	spin_lock_bh(&pmlmepriv->lock);

	spin_lock_bh(&pmlmepriv->lock);





	DBG_88E("Set SSID under fw_state = 0x%08x\n", get_fwstate(pmlmepriv));

	DBG_88E("Set SSID under fw_state = 0x%08x\n", get_fwstate(pmlmepriv));

	if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true)

	if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY))

		goto handle_tkip_countermeasure;

		goto handle_tkip_countermeasure;

	else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true)

	else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING))

		goto release_mlme_lock;

		goto release_mlme_lock;





	if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE)) {

	if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE)) {
@@ -240,12 +240,12 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid) 
					/* 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);

					rtw_disassoc_cmd(padapter, 0, true);





					if (check_fwstate(pmlmepriv, _FW_LINKED) == true)

					if (check_fwstate(pmlmepriv, _FW_LINKED))

						rtw_indicate_disconnect(padapter);

						rtw_indicate_disconnect(padapter);





					rtw_free_assoc_resources(padapter);

					rtw_free_assoc_resources(padapter);





					if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true) {

					if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {

						_clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE);

						_clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE);

						set_fwstate(pmlmepriv, WIFI_ADHOC_STATE);

						set_fwstate(pmlmepriv, WIFI_ADHOC_STATE);

					}

					}
@@ -262,12 +262,12 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid) 




			rtw_disassoc_cmd(padapter, 0, true);

			rtw_disassoc_cmd(padapter, 0, true);





			if (check_fwstate(pmlmepriv, _FW_LINKED) == true)

			if (check_fwstate(pmlmepriv, _FW_LINKED))

				rtw_indicate_disconnect(padapter);

				rtw_indicate_disconnect(padapter);





			rtw_free_assoc_resources(padapter);

			rtw_free_assoc_resources(padapter);





			if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true) {

			if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {

				_clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE);

				_clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE);

				set_fwstate(pmlmepriv, WIFI_ADHOC_STATE);

				set_fwstate(pmlmepriv, WIFI_ADHOC_STATE);

			}

			}
@@ -291,7 +291,7 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid) 
	memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(struct ndis_802_11_ssid));

	memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(struct 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))

		pmlmepriv->to_join = true;

		pmlmepriv->to_join = true;

	else

	else

		status = rtw_do_join(padapter);

		status = rtw_do_join(padapter);
@@ -340,7 +340,7 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter, 
			rtw_free_assoc_resources(padapter);

			rtw_free_assoc_resources(padapter);





		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))

				rtw_indicate_disconnect(padapter); /* will clr Linked_state; before this function, we must have checked whether  issue dis-assoc_cmd or not */

				rtw_indicate_disconnect(padapter); /* will clr Linked_state; before this function, we must have checked whether  issue dis-assoc_cmd or not */

	       }

	       }
@@ -416,7 +416,7 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_s 
		res = true;

		res = true;





		if (check_fwstate(pmlmepriv,

		if (check_fwstate(pmlmepriv,

				(_FW_UNDER_SURVEY|_FW_UNDER_LINKING)) == true)

				  _FW_UNDER_SURVEY|_FW_UNDER_LINKING))

			RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("\n###_FW_UNDER_SURVEY|_FW_UNDER_LINKING\n\n"));

			RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("\n###_FW_UNDER_SURVEY|_FW_UNDER_LINKING\n\n"));

		else

		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"));