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

staging: r8188eu: clean up comparsions to true 



Clean up comparsions to true.

x == true -> x

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210818080854.15847-1-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 39876a01

drivers/staging/r8188eu/core/rtw_cmd.c

+8 −8
Original line number Diff line number Diff line
@@ -397,11 +397,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)) {

		rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SCAN, 1);

	}



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

	if (check_fwstate(pmlmepriv, _FW_LINKED)) {

		p2p_ps_wk_cmd(padapter, P2P_PS_SCAN, 1);

	}
@@ -1488,7 +1488,7 @@ static void dynamic_chk_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz) 
	pmlmepriv = &padapter->mlmepriv;



#ifdef CONFIG_88EU_AP_MODE

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

	if (check_fwstate(pmlmepriv, WIFI_AP_STATE))

		expire_timeout_chk(padapter);

#endif
@@ -1506,13 +1506,13 @@ static void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type) 
	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	u8	mstatus;



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

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

	if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) ||

	    check_fwstate(pmlmepriv, WIFI_ADHOC_STATE))

		return;



	switch (lps_ctrl_type) {

	case LPS_CTRL_SCAN:

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

		if (check_fwstate(pmlmepriv, _FW_LINKED)) {

			/* connect */

			LPS_Leave(padapter);

		}
@@ -1913,7 +1913,7 @@ static void c2h_wk_callback(struct work_struct *work) 
			continue;

		}



		if (ccx_id_filter(c2h_evt->id) == true) {

		if (ccx_id_filter(c2h_evt->id)) {

			/* Handle CCX report here */

			rtw_hal_c2h_handler(adapter, c2h_evt);

			kfree(c2h_evt);
@@ -2117,7 +2117,7 @@ void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter, struct cmd_obj * 


	spin_lock_bh(&pmlmepriv->lock);



	if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == true) && (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true))

	if (check_fwstate(pmlmepriv, WIFI_MP_STATE) && check_fwstate(pmlmepriv, _FW_UNDER_LINKING))

		_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);



	set_fwstate(pmlmepriv, _FW_LINKED);

drivers/staging/r8188eu/core/rtw_ieee80211.c

+2 −2
Original line number Diff line number Diff line
@@ -100,9 +100,9 @@ int rtw_check_network_type(unsigned char *rate, int ratelen, int channel) 
	if (channel > 14) {

		return WIRELESS_INVALID;

	} else {  /*  could be pure B, pure G, or B/G */

		if ((rtw_is_cckratesonly_included(rate)) == true)

		if (rtw_is_cckratesonly_included(rate))

			return WIRELESS_11B;

		else if ((rtw_is_cckrates_included(rate)) == true)

		else if (rtw_is_cckrates_included(rate))

			return	WIRELESS_11BG;

		else

			return WIRELESS_11G;

drivers/staging/r8188eu/core/rtw_ioctl_set.c

+11 −11
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ u8 rtw_do_join(struct adapter *padapter) 
			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)) {

				/*  submit createbss_cmd to change to a ADHOC_MASTER */



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



	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;

	else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING))

		goto release_mlme_lock;
@@ -161,7 +161,7 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid) 
		} else {

			rtw_disassoc_cmd(padapter, 0, true);



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

			if (check_fwstate(pmlmepriv, _FW_LINKED))

				rtw_indicate_disconnect(padapter);



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



	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;

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

	} else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) {

		goto release_mlme_lock;

	}
@@ -236,12 +236,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 */

					rtw_disassoc_cmd(padapter, 0, true);



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

					if (check_fwstate(pmlmepriv, _FW_LINKED))

						rtw_indicate_disconnect(padapter);



					rtw_free_assoc_resources(padapter, 1);



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

					if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {

						_clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE);

						set_fwstate(pmlmepriv, WIFI_ADHOC_STATE);

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

			rtw_disassoc_cmd(padapter, 0, true);



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

			if (check_fwstate(pmlmepriv, _FW_LINKED))

				rtw_indicate_disconnect(padapter);



			rtw_free_assoc_resources(padapter, 1);



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

			if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {

				_clr_fwstate_(pmlmepriv, WIFI_ADHOC_MASTER_STATE);

				set_fwstate(pmlmepriv, WIFI_ADHOC_STATE);

			}
@@ -283,7 +283,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));

	pmlmepriv->assoc_by_bssid = false;



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

	if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) {

		pmlmepriv->to_join = true;

	} else {

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



		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 chked whether  issue dis-assoc_cmd or not */

	       }

drivers/staging/r8188eu/core/rtw_mlme.c

+12 −12
Original line number Diff line number Diff line
@@ -508,8 +508,8 @@ static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex 
{

	struct	mlme_priv	*pmlmepriv = &adapter->mlmepriv;



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

	    (is_same_network(&pmlmepriv->cur_network.network, pnetwork))) {

	if (check_fwstate(pmlmepriv, _FW_LINKED) &&

	    is_same_network(&pmlmepriv->cur_network.network, pnetwork)) {

		update_network(&pmlmepriv->cur_network.network, pnetwork, adapter, true);

		rtw_update_protection(adapter, (pmlmepriv->cur_network.network.IEs) + sizeof(struct ndis_802_11_fixed_ie),

				      pmlmepriv->cur_network.network.IELength);
@@ -669,7 +669,7 @@ static int rtw_is_desired_network(struct adapter *adapter, struct wlan_network * 
		bselected = false;

	}



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

	if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {

		if (pnetwork->network.InfrastructureMode != pmlmepriv->cur_network.network.InfrastructureMode)

			bselected = false;

	}
@@ -691,7 +691,7 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf) 
	spin_lock_bh(&pmlmepriv->lock);



	/*  update IBSS_network 's timestamp */

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

	if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {

		if (!memcmp(&pmlmepriv->cur_network.network.MacAddress, pnetwork->MacAddress, ETH_ALEN)) {

			struct wlan_network *ibss_wlan = NULL;
@@ -805,7 +805,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) 


	spin_unlock_bh(&pmlmepriv->lock);



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

	if (check_fwstate(pmlmepriv, _FW_LINKED))

		p2p_ps_wk_cmd(adapter, P2P_PS_SCAN_DONE, 0);



	rtw_os_xmit_schedule(adapter);
@@ -1127,14 +1127,14 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) 
					}



					ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->network.MacAddress);

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

					if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) {

						if (ptarget_wlan)

							ptarget_wlan->fixed = true;

					}

				}

			} else {

				ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->network.MacAddress);

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

				if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) {

					if (ptarget_wlan)

						ptarget_wlan->fixed = true;

				}
@@ -1149,7 +1149,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) 
			}



			/* s3. find ptarget_sta & update ptarget_sta after update cur_network only for station mode */

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

			if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) {

				ptarget_sta = rtw_joinbss_update_stainfo(adapter, pnetwork);

				if (!ptarget_sta) {

					spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
@@ -1158,7 +1158,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) 
			}



			/* s4. indicate connect */

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

			if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) {

				pmlmepriv->cur_network_scanned = ptarget_wlan;

				rtw_indicate_connect(adapter);

			}
@@ -1176,7 +1176,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) 
		rtw_reset_securitypriv(adapter);

		_set_timer(&pmlmepriv->assoc_timer, 1);



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

		if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING))

			_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);

	} else { /* if join_res < 0 (join fails), then try again */

		_set_timer(&pmlmepriv->assoc_timer, 1);
@@ -1499,7 +1499,7 @@ void rtw_dynamic_check_timer_handlder(struct adapter *adapter) 
	rcu_read_lock();



	if (rcu_dereference(adapter->pnetdev->rx_handler_data) &&

	    (check_fwstate(pmlmepriv, WIFI_STATION_STATE | WIFI_ADHOC_STATE) == true)) {

	    check_fwstate(pmlmepriv, WIFI_STATION_STATE | WIFI_ADHOC_STATE)) {

		/*  expire NAT2.5 entry */

		nat25_db_expire(adapter);
@@ -1610,7 +1610,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv) 
	}



	/*  check for situation of  _FW_LINKED */

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

	if (check_fwstate(pmlmepriv, _FW_LINKED)) {

		DBG_88E("%s: _FW_LINKED while ask_for_joinbss!!!\n", __func__);



		rtw_disassoc_cmd(adapter, 0, true);

drivers/staging/r8188eu/core/rtw_mp.c

+2 −2
Original line number Diff line number Diff line
@@ -361,11 +361,11 @@ s32 mp_start_test(struct adapter *padapter) 


	spin_lock_bh(&pmlmepriv->lock);



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

	if (check_fwstate(pmlmepriv, WIFI_MP_STATE))

		goto end_of_mp_start_test;



	/* init mp_start_test status */

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

	if (check_fwstate(pmlmepriv, _FW_LINKED)) {

		rtw_disassoc_cmd(padapter, 500, true);

		rtw_indicate_disconnect(padapter);

		rtw_free_assoc_resources(padapter, 1);