Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging: rtl8188eu: cleanup remaining comparsions to true 



Cleanup remaining comparsions to true.
if (x == true) -> if (x)
if (x != true) -> if (!x)
if (!x == true) -> if (!x)

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

drivers/staging/rtl8188eu/core/rtw_ap.c

+2 −2
Original line number Diff line number Diff line
@@ -629,7 +629,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf) 
	}



	/* setting only at  first time */

	if (pmlmepriv->cur_network.join_res != true) {

	if (!pmlmepriv->cur_network.join_res) {

		/* WEP Key will be set before this function, do not

		 * clear CAM.

		 */
@@ -756,7 +756,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 


	DBG_88E("%s, len =%d\n", __func__, len);



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

	if (!check_fwstate(pmlmepriv, WIFI_AP_STATE))

		return _FAIL;



	if (len < 0 || len > MAX_IE_SZ)

drivers/staging/rtl8188eu/core/rtw_cmd.c

+5 −5
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ 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);



	ph2c = kzalloc(sizeof(*ph2c), GFP_ATOMIC);
@@ -820,7 +820,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
@@ -836,13 +836,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);

		}

drivers/staging/rtl8188eu/core/rtw_mlme.c

+13 −13
Original line number Diff line number Diff line
@@ -315,8 +315,8 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst) 
	d_cap = le16_to_cpu(le_dcap);



	return ((src->Ssid.SsidLength == dst->Ssid.SsidLength) &&

		((!memcmp(src->MacAddress, dst->MacAddress, ETH_ALEN)) == true) &&

		((!memcmp(src->Ssid.Ssid, dst->Ssid.Ssid, src->Ssid.SsidLength)) == true) &&

		(!memcmp(src->MacAddress, dst->MacAddress, ETH_ALEN)) &&

		(!memcmp(src->Ssid.Ssid, dst->Ssid.Ssid, src->Ssid.SsidLength)) &&

		((s_cap & WLAN_CAPABILITY_IBSS) ==

		(d_cap & WLAN_CAPABILITY_IBSS)) &&

		((s_cap & WLAN_CAPABILITY_ESS) ==
@@ -386,8 +386,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.ie_length);
@@ -529,7 +529,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;

	}
@@ -561,7 +561,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;
@@ -614,7 +614,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) 
	rtw_set_signal_stat_timer(&adapter->recvpriv);



	if (pmlmepriv->to_join) {

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

		if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {

			if (!check_fwstate(pmlmepriv, _FW_LINKED)) {

				set_fwstate(pmlmepriv, _FW_UNDER_LINKING);
@@ -1005,14 +1005,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;

				}
@@ -1028,7 +1028,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) {

					RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("Can't update stainfo when joinbss_event callback\n"));
@@ -1038,7 +1038,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)) {

				rtw_indicate_connect(adapter);

			} else {

				/* adhoc mode will rtw_indicate_connect when rtw_stassoc_event_callback */
@@ -1063,7 +1063,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) 
		mod_timer(&pmlmepriv->assoc_timer,

			  jiffies + msecs_to_jiffies(1));



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

		if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) {

			RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("fail! clear _FW_UNDER_LINKING ^^^fw_state=%x\n", get_fwstate(pmlmepriv)));

			_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);

		}
@@ -1488,7 +1488,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/rtl8188eu/core/rtw_recv.c

+8 −8
Original line number Diff line number Diff line
@@ -650,8 +650,8 @@ int sta2sta_data_frame(struct adapter *adapter, struct recv_frame *precv_frame, 
	u8 *sta_addr = NULL;

	bool mcast = is_multicast_ether_addr(pattrib->dst);



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

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

	if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) ||

	    check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {

		/*  filter packets that SA is myself or multicast or broadcast */

		if (!memcmp(myhwaddr, pattrib->src, ETH_ALEN)) {

			RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, (" SA==myself\n"));
@@ -729,8 +729,8 @@ static int ap2sta_data_frame( 
	u8 *myhwaddr = myid(&adapter->eeprompriv);

	bool mcast = is_multicast_ether_addr(pattrib->dst);



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

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

	if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) &&

	    (check_fwstate(pmlmepriv, _FW_LINKED) ||

	     check_fwstate(pmlmepriv, _FW_UNDER_LINKING))) {

		/*  filter packets that SA is myself or multicast or broadcast */

		if (!memcmp(myhwaddr, pattrib->src, ETH_ALEN)) {
@@ -817,7 +817,7 @@ static int sta2ap_data_frame(struct adapter *adapter, 
	unsigned char *mybssid  = get_bssid(pmlmepriv);

	int ret = _SUCCESS;



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

	if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {

		/* For AP mode, RA = BSSID, TX = STA(SRC_ADDR), A3 = DST_ADDR */

		if (memcmp(pattrib->bssid, mybssid, ETH_ALEN)) {

			ret = _FAIL;
@@ -949,7 +949,7 @@ static int validate_recv_ctrl_frame(struct adapter *padapter, 
				pxmitframe->attrib.triggered = 1;



				spin_unlock_bh(&psta->sleep_q.lock);

				if (rtw_hal_xmit(padapter, pxmitframe) == true)

				if (rtw_hal_xmit(padapter, pxmitframe))

					rtw_os_xmit_complete(padapter, pxmitframe);

				spin_lock_bh(&psta->sleep_q.lock);
@@ -1838,7 +1838,7 @@ void rtw_reordering_ctrl_timeout_handler(struct timer_list *t) 


	spin_lock_bh(&ppending_recvframe_queue->lock);



	if (recv_indicatepkts_in_order(padapter, preorder_ctrl, true) == true)

	if (recv_indicatepkts_in_order(padapter, preorder_ctrl, true))

		mod_timer(&preorder_ctrl->reordering_ctrl_timer,

			  jiffies + msecs_to_jiffies(REORDER_WAIT_TIME));

drivers/staging/rtl8188eu/core/rtw_sta_mgt.c

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) 
	while (phead != plist) {

		psta = container_of(plist, struct sta_info, hash_list);



		if ((!memcmp(psta->hwaddr, addr, ETH_ALEN)) == true) {

		if (!memcmp(psta->hwaddr, addr, ETH_ALEN)) {

			/*  if found the matched address */

			break;

		}