staging: r8188eu: clean up comparsions to true
PATCH 1/2 staging: r8188eu: clean up comparsions to true
Clean up comparsions to true.
x == true -> x
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/r8188eu/core/rtw_cmd.c | 16 ++++++------- drivers/staging/r8188eu/core/rtw_ieee80211.c | 4 ++-- drivers/staging/r8188eu/core/rtw_ioctl_set.c | 22 +++++++++--------- drivers/staging/r8188eu/core/rtw_mlme.c | 24 ++++++++++---------- drivers/staging/r8188eu/core/rtw_mp.c | 4 ++-- drivers/staging/r8188eu/core/rtw_mp_ioctl.c | 4 ++-- drivers/staging/r8188eu/core/rtw_recv.c | 22 +++++++++--------- drivers/staging/r8188eu/core/rtw_wlan_util.c | 10 ++++---- drivers/staging/r8188eu/core/rtw_xmit.c | 4 ++-- drivers/staging/r8188eu/hal/hal_intf.c | 2 +- drivers/staging/r8188eu/hal/odm.c | 2 +- drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 2 +- drivers/staging/r8188eu/include/rtw_mlme.h | 2 +- drivers/staging/r8188eu/os_dep/ioctl_linux.c | 16 ++++++------- 14 files changed, 67 insertions(+), 67 deletions(-)
drivers/staging/r8188eu/core/rtw_cmd.c +8 -8
@@ -401,11 +401,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 ); }
@@ -1495,7 +1495,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
@@ -1513,13 +1513,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); }
@@ -1920,7 +1920,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);
@@ -2124,7 +2124,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
@@ -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
@@ -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
@@ -509,8 +509,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);
@@ -670,7 +670,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; }
@@ -692,7 +692,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 ;
@@ -806,7 +806,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);
@@ -1128,14 +1128,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; }
@@ -1150,7 +1150,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);
@@ -1159,7 +1159,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); }
@@ -1177,7 +1177,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 );
@@ -1500,7 +1500,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);
@@ -1611,7 +1611,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
@@ -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 );
drivers/staging/r8188eu/core/rtw_mp_ioctl.c +2 -2
@@ -974,14 +974,14 @@ int rtl8188eu_oid_rt_pro_rw_efuse_pgpkt_hdl(struct oid_par_priv *poid_par_priv)if (poid_par_priv->type_of_oid ==QUERY_OID ) {Efuse_PowerSwitch (Adapter, false, true); -if (Efuse_PgPacketRead (Adapter, ppgpkt->offset, ppgpkt->data, false) == true) +if (Efuse_PgPacketRead (Adapter, ppgpkt->offset, ppgpkt->data, false)) *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;else status =NDIS_STATUS_FAILURE ;Efuse_PowerSwitch (Adapter, false, false); }else {Efuse_PowerSwitch (Adapter, true, true); -if (Efuse_PgPacketWrite (Adapter, ppgpkt->offset, ppgpkt->word_en, ppgpkt->data, false) == true) +if (Efuse_PgPacketWrite (Adapter, ppgpkt->offset, ppgpkt->word_en, ppgpkt->data, false)) *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len;else status =NDIS_STATUS_FAILURE ;
drivers/staging/r8188eu/core/rtw_recv.c +11 -11
@@ -361,7 +361,7 @@ static int recvframe_chkmic(struct adapter *adapter, struct recv_frame *precvfrif (bmic_err) {/* double check key_index for some timing issue , */ /* cannot compare with psecuritypriv->dot118021XGrpKeyid also cause timing issue */ -if ((IS_MCAST (prxattrib->ra) == true) && (prxattrib->key_index != pmlmeinfo->key_index)) +if (IS_MCAST (prxattrib->ra) && prxattrib->key_index != pmlmeinfo->key_index) brpt_micerror = false;if ((prxattrib->bdecrypted) && (brpt_micerror)) {
@@ -652,8 +652,8 @@ int sta2sta_data_frame(struct adapter *adapter, struct recv_frame *precv_frame,u8 *sta_addr =NULL ;int bmcast =IS_MCAST (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 )) { ret = _FAIL;
@@ -715,7 +715,7 @@ int sta2sta_data_frame(struct adapter *adapter, struct recv_frame *precv_frame,if (!*psta) {if (adapter->registrypriv.mp_mode ==1 ) { -if (check_fwstate (pmlmepriv,WIFI_MP_STATE ) == true) +if (check_fwstate (pmlmepriv,WIFI_MP_STATE )) adapter->mppriv.rx_pktloss++; } ret = _FAIL;
@@ -741,9 +741,9 @@ static int ap2sta_data_frame(u8 *myhwaddr =myid (&adapter->eeprompriv);int bmcast =IS_MCAST (pattrib->dst); -if ((check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true) && - (check_fwstate (pmlmepriv, _FW_LINKED) == true || -check_fwstate (pmlmepriv, _FW_UNDER_LINKING))) { +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 )) { ret = _FAIL;
@@ -788,8 +788,8 @@ static int ap2sta_data_frame( ret =RTW_RX_HANDLED ; goto exit; } - }else if ((check_fwstate (pmlmepriv,WIFI_MP_STATE ) == true) && - (check_fwstate (pmlmepriv, _FW_LINKED) == true)) { + }else if (check_fwstate (pmlmepriv,WIFI_MP_STATE ) && +check_fwstate (pmlmepriv, _FW_LINKED)) {memcpy (pattrib->dst,GetAddr1Ptr (ptr),ETH_ALEN );memcpy (pattrib->src,GetAddr2Ptr (ptr),ETH_ALEN );memcpy (pattrib->bssid,GetAddr3Ptr (ptr),ETH_ALEN );
@@ -837,7 +837,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;
@@ -1817,7 +1817,7 @@ void rtw_reordering_ctrl_timeout_handler(void *pcontext)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))_set_timer (&preorder_ctrl->reordering_ctrl_timer,REORDER_WAIT_TIME );spin_unlock_bh (&ppending_recvframe_queue->lock);
drivers/staging/r8188eu/core/rtw_wlan_util.c +5 -5
@@ -112,9 +112,9 @@ u8 judge_network_type(struct adapter *padapter, unsigned char *rate, int ratelenif (pmlmeinfo->HT_enable) network_type =WIRELESS_11_24N ; -if ((cckratesonly_included (rate, ratelen)) == true) +if (cckratesonly_included (rate, ratelen)) network_type |=WIRELESS_11B ; -else if ((cckrates_included (rate, ratelen)) == true) +else if (cckrates_included (rate, ratelen)) network_type |=WIRELESS_11BG ;else network_type |=WIRELESS_11G ;
@@ -202,7 +202,7 @@ static unsigned int ratetbl2rateset(struct adapter *padapter, unsigned char *ratdefault : rate =ratetbl_val_2wifirate (rate); -if (is_basicrate (padapter, rate) == true) +if (is_basicrate (padapter, rate)) rate |=IEEE80211_BASIC_RATE_MASK ; rateset[len] = rate;
@@ -1513,9 +1513,9 @@ void update_wireless_mode(struct adapter *padapter)if (pmlmeinfo->HT_enable) network_type =WIRELESS_11_24N ; -if ((cckratesonly_included (rate, ratelen)) == true) +if (cckratesonly_included (rate, ratelen)) network_type |=WIRELESS_11B ; -else if ((cckrates_included (rate, ratelen)) == true) +else if (cckrates_included (rate, ratelen)) network_type |=WIRELESS_11BG ;else network_type |=WIRELESS_11G ;
drivers/staging/r8188eu/core/rtw_xmit.c +2 -2
@@ -490,7 +490,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct pif (!psta) {/* if we cannot get psta => drrp the pkt */ res = _FAIL; goto exit; - }else if ((check_fwstate (pmlmepriv,WIFI_AP_STATE ) == true) && (!(psta->state & _FW_LINKED))) { + }else if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) && !(psta->state & _FW_LINKED)) { res = _FAIL; goto exit; }
@@ -2154,7 +2154,7 @@ void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *pst pxmitframe->attrib.triggered =1 ; -if (rtw_hal_xmit (padapter, pxmitframe) == true) +if (rtw_hal_xmit (padapter, pxmitframe))rtw_os_xmit_complete (padapter, pxmitframe);if ((psta->sleepq_ac_len ==0 ) && (!psta->has_legacy_ac) && (wmmps_ac)) {
drivers/staging/r8188eu/hal/hal_intf.c +1 -1
@@ -250,7 +250,7 @@ void rtw_hal_update_ra_mask(struct adapter *adapt, u32 mac_id, u8 rssi_level) {struct mlme_priv *pmlmepriv = &adapt->mlmepriv; -if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) == true) { +if (check_fwstate (pmlmepriv,WIFI_AP_STATE )) {#ifdef CONFIG_88EU_AP_MODE struct sta_info *psta =NULL ;struct sta_priv *pstapriv = &adapt->stapriv;
drivers/staging/r8188eu/hal/odm.c +1 -1
@@ -1345,7 +1345,7 @@ static void FindMinimumRSSI(struct adapter *pAdapter)if ((check_fwstate (pmlmepriv, _FW_LINKED) == false) && (pdmpriv->EntryMinUndecoratedSmoothedPWDB ==0 )) pdmpriv->MinUndecoratedPWDBForDM =0 ; -if (check_fwstate (pmlmepriv, _FW_LINKED) == true)/* Default port */ +if (check_fwstate (pmlmepriv, _FW_LINKED))/* Default port */ pdmpriv->MinUndecoratedPWDBForDM = pdmpriv->EntryMinUndecoratedSmoothedPWDB;else /* associated entry pwdb */ pdmpriv->MinUndecoratedPWDBForDM = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
drivers/staging/r8188eu/hal/rtl8188eu_xmit.c +1 -1
@@ -626,7 +626,7 @@ static s32 pre_xmitframe(struct adapter *adapt, struct xmit_frame *pxmitframe)if (rtw_txframes_sta_ac_pending (adapt, pattrib) >0 ) goto enqueue; -if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING) == true) +if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING)) goto enqueue; pxmitbuf =rtw_alloc_xmitbuf (pxmitpriv);
drivers/staging/r8188eu/include/rtw_mlme.h +1 -1
@@ -516,7 +516,7 @@ static inline void _clr_fwstate_(struct mlme_priv *pmlmepriv, int state)static inline void clr_fwstate (struct mlme_priv *pmlmepriv,int state) {spin_lock_bh (&pmlmepriv->lock); -if (check_fwstate (pmlmepriv, state) == true) +if (check_fwstate (pmlmepriv, state)) pmlmepriv->fw_state ^= state;spin_unlock_bh (&pmlmepriv->lock); }
drivers/staging/r8188eu/os_dep/ioctl_linux.c +8 -8
@@ -374,7 +374,7 @@ static char *translate_scan(struct adapter *padapter, iwe.cmd =IWEVQUAL ; iwe.u.qual.updated =IW_QUAL_QUAL_UPDATED |IW_QUAL_LEVEL_UPDATED |IW_QUAL_NOISE_INVALID ; -if (check_fwstate (pmlmepriv, _FW_LINKED) == true && +if (check_fwstate (pmlmepriv, _FW_LINKED) &&is_same_network (&pmlmepriv->cur_network.network, &pnetwork->network)) { ss = padapter->recvpriv.signal_strength; sq = padapter->recvpriv.signal_qual;
@@ -718,7 +718,7 @@ static int rtw_wx_get_name(struct net_device *dev,struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;NDIS_802_11_RATES_EX *prates =NULL ; -if (check_fwstate (pmlmepriv, _FW_LINKED |WIFI_ADHOC_MASTER_STATE ) == true) { +if (check_fwstate (pmlmepriv, _FW_LINKED |WIFI_ADHOC_MASTER_STATE )) {/* parsing HT_CAP_IE */ p =rtw_get_ie (&pcur_bss->IEs[12 ], _HT_CAPABILITY_IE_, &ht_ielen, pcur_bss->IELength -12 );if (p && ht_ielen >0 )
@@ -726,12 +726,12 @@ static int rtw_wx_get_name(struct net_device *dev, prates = &pcur_bss->SupportedRates; -if (rtw_is_cckratesonly_included ((u8 *)prates) == true) { +if (rtw_is_cckratesonly_included ((u8 *)prates)) {if (ht_cap)snprintf (wrqu->name,IFNAMSIZ ,"IEEE 802.11bn" );else snprintf (wrqu->name,IFNAMSIZ ,"IEEE 802.11b" ); - }else if ((rtw_is_cckrates_included ((u8 *)prates)) == true) { + }else if (rtw_is_cckrates_included ((u8 *)prates)) {if (ht_cap)snprintf (wrqu->name,IFNAMSIZ ,"IEEE 802.11bgn" );else
@@ -1112,9 +1112,9 @@ static int rtw_wx_get_wap(struct net_device *dev,memset (wrqu->ap_addr.sa_data,0 ,ETH_ALEN ); -if (((check_fwstate (pmlmepriv, _FW_LINKED)) == true) || - ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) == true) || - ((check_fwstate (pmlmepriv,WIFI_AP_STATE )) == true)) +if (check_fwstate (pmlmepriv, _FW_LINKED) || +check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) || +check_fwstate (pmlmepriv,WIFI_AP_STATE ))memcpy (wrqu->ap_addr.sa_data, pcur_bss->MacAddress,ETH_ALEN );else memset (wrqu->ap_addr.sa_data,0 ,ETH_ALEN );
@@ -1445,7 +1445,7 @@ static int rtw_wx_set_essid(struct net_device *dev,if ((!memcmp (dst_ssid, src_ssid, ndis_ssid.SsidLength)) && (pnetwork->network.Ssid.SsidLength == ndis_ssid.SsidLength)) { -if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true) { +if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) {if (pnetwork->network.InfrastructureMode != pmlmepriv->cur_network.network.InfrastructureMode)continue ; }
Signature · 1 line
2.32.0
PATCH 2/2 staging: r8188eu: clean up comparsions to false
Clean up comparsions to false.
x == false -> !x
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/r8188eu/core/rtw_cmd.c | 4 ++-- drivers/staging/r8188eu/core/rtw_ioctl_set.c | 2 +- drivers/staging/r8188eu/core/rtw_mlme.c | 12 ++++++------ drivers/staging/r8188eu/core/rtw_mp.c | 4 ++-- drivers/staging/r8188eu/core/rtw_pwrctrl.c | 14 +++++++------- drivers/staging/r8188eu/core/rtw_recv.c | 4 ++-- drivers/staging/r8188eu/core/rtw_wlan_util.c | 2 +- drivers/staging/r8188eu/core/rtw_xmit.c | 4 ++-- drivers/staging/r8188eu/hal/odm.c | 6 +++--- drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 2 +- drivers/staging/r8188eu/hal/rtl8188e_mp.c | 2 +- drivers/staging/r8188eu/hal/usb_halinit.c | 2 +- drivers/staging/r8188eu/os_dep/ioctl_linux.c | 8 ++++---- drivers/staging/r8188eu/os_dep/xmit_linux.c | 2 +- 14 files changed, 34 insertions(+), 34 deletions(-)
drivers/staging/r8188eu/core/rtw_cmd.c +2 -2
@@ -1870,13 +1870,13 @@ static s32 c2h_evt_hdl(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2hif (c2h_evt_read (adapter, buf) == _SUCCESS) { c2h_evt = (struct c2h_evt_hdr *)buf; -if (filter &&filter (c2h_evt->id) == false) +if (filter && !filter (c2h_evt->id)) goto exit; ret =rtw_hal_c2h_handler (adapter, c2h_evt); } }else { -if (filter &&filter (c2h_evt->id) == false) +if (filter && !filter (c2h_evt->id)) goto exit; ret =rtw_hal_c2h_handler (adapter, c2h_evt);
drivers/staging/r8188eu/core/rtw_ioctl_set.c +1 -1
@@ -156,7 +156,7 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid)if (check_fwstate (pmlmepriv, _FW_LINKED |WIFI_ADHOC_MASTER_STATE )) {if (!memcmp (&pmlmepriv->cur_network.network.MacAddress, bssid,ETH_ALEN )) { -if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == false) +if (!check_fwstate (pmlmepriv,WIFI_STATION_STATE )) goto release_mlme_lock;/* it means driver is in WIFI_ADHOC_MASTER_STATE, we needn't create bss again. */ }else {rtw_disassoc_cmd (padapter,0 , true);
drivers/staging/r8188eu/core/rtw_mlme.c +6 -6
@@ -298,7 +298,7 @@ int rtw_if_up(struct adapter *padapter)int res;if (padapter->bDriverStopped || padapter->bSurpriseRemoved || - (check_fwstate (&padapter->mlmepriv, _FW_LINKED) == false)) + !check_fwstate (&padapter->mlmepriv, _FW_LINKED)) res = false;else res = true;
@@ -709,7 +709,7 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf) }/* lock pmlmepriv->lock when you accessing network_q */ -if ((check_fwstate (pmlmepriv, _FW_UNDER_LINKING)) == false) { +if (!check_fwstate (pmlmepriv, _FW_UNDER_LINKING)) {if (pnetwork->Ssid.Ssid[0 ] ==0 ) pnetwork->Ssid.SsidLength =0 ;rtw_add_network (adapter, pnetwork);
@@ -749,7 +749,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)if (pmlmepriv->to_join) {if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) { -if (check_fwstate (pmlmepriv, _FW_LINKED) == false) { +if (!check_fwstate (pmlmepriv, _FW_LINKED)) {set_fwstate (pmlmepriv, _FW_UNDER_LINKING);if (rtw_select_and_join_from_scanned_queue (pmlmepriv) == _SUCCESS) {
@@ -1253,7 +1253,7 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)struct wlan_network *cur_network = &pmlmepriv->cur_network;struct wlan_network *ptarget_wlan =NULL ; -if (rtw_access_ctrl (adapter, pstassoc->macaddr) == false) +if (!rtw_access_ctrl (adapter, pstassoc->macaddr))return ;#if defined(CONFIG_88EU_AP_MODE )
@@ -1543,12 +1543,12 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv goto exit; } -if (rtw_is_desired_network (adapter, competitor) == false) +if (!rtw_is_desired_network (adapter, competitor)) goto exit;if (rtw_to_roaming (adapter) >0 ) {if (rtw_get_passing_time_ms ((u32 )competitor->last_scanned) >=RTW_SCAN_RESULT_EXPIRE || -is_same_ess (&competitor->network, &pmlmepriv->cur_network.network) == false) + !is_same_ess (&competitor->network, &pmlmepriv->cur_network.network)) goto exit; }
drivers/staging/r8188eu/core/rtw_mp.c +2 -2
@@ -421,7 +421,7 @@ void mp_stop_test(struct adapter *padapter)if (pmppriv->mode ==MP_ON ) { pmppriv->bSetTxPower =0 ;spin_lock_bh (&pmlmepriv->lock); -if (check_fwstate (pmlmepriv,WIFI_MP_STATE ) == false) +if (!check_fwstate (pmlmepriv,WIFI_MP_STATE )) goto end_of_mp_stop_test;/* 3 1. disconnect psudo AdHoc */
@@ -866,7 +866,7 @@ u32 mp_query_psd(struct adapter *pAdapter, u8 *data)if (!netif_running (pAdapter->pnetdev))return 0 ; -if (check_fwstate (&pAdapter->mlmepriv,WIFI_MP_STATE ) == false) +if (!check_fwstate (&pAdapter->mlmepriv,WIFI_MP_STATE ))return 0 ;if (strlen (data) ==0 ) {/* default value */
drivers/staging/r8188eu/core/rtw_pwrctrl.c +7 -7
@@ -256,15 +256,15 @@ static u8 PS_RDY_CHECK(struct adapter *padapter)if (delta_time <LPS_DELAY_TIME )return false; -if ((check_fwstate (pmlmepriv, _FW_LINKED) == false) || - (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY)) || - (check_fwstate (pmlmepriv,WIFI_AP_STATE )) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ))) +if (!check_fwstate (pmlmepriv, _FW_LINKED) || +check_fwstate (pmlmepriv, _FW_UNDER_SURVEY) || +check_fwstate (pmlmepriv,WIFI_AP_STATE ) || +check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) || +check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ))return false;if (pwrpriv->bInSuspend)return false; -if ((padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) && (padapter->securitypriv.binstallGrpkey == false)) { +if (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X && !padapter->securitypriv.binstallGrpkey) {DBG_88E ("Group handshake still in progress !!!\n" );return false; }
@@ -365,7 +365,7 @@ void LPS_Enter(struct adapter *padapter) {struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -if (PS_RDY_CHECK (padapter) == false) +if (!PS_RDY_CHECK (padapter))return ;if (pwrpriv->bLeisurePs) {
drivers/staging/r8188eu/core/rtw_recv.c +2 -2
@@ -1873,7 +1873,7 @@ static int recv_func_prehandle(struct adapter *padapter, struct recv_frame *rfraelse padapter->mppriv.rx_pktcount++; -if (check_fwstate (pmlmepriv,WIFI_MP_LPBK_STATE ) == false) { +if (!check_fwstate (pmlmepriv,WIFI_MP_LPBK_STATE )) { ret = _FAIL;rtw_free_recvframe (rframe, pfree_recv_queue);/* free this recv_frame */ goto exit;
@@ -2035,7 +2035,7 @@ void rtw_signal_stat_timer_hdl(struct timer_list *t) }/* update value of signal_strength, rssi, signal_qual */ -if (check_fwstate (&adapter->mlmepriv, _FW_UNDER_SURVEY) == false) { +if (!check_fwstate (&adapter->mlmepriv, _FW_UNDER_SURVEY)) { tmp_s = (avg_signal_strength + (_alpha -1 ) * recvpriv->signal_strength);if (tmp_s % _alpha) tmp_s = tmp_s / _alpha +1 ;
drivers/staging/r8188eu/core/rtw_wlan_util.c +1 -1
@@ -893,7 +893,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)unsigned short ht_cap_info;unsigned char ht_info_infos_0; -if (is_client_associated_to_ap (Adapter) == false) +if (!is_client_associated_to_ap (Adapter))return true; len = packet_len -sizeof (struct rtw_ieee80211_hdr_3addr );
drivers/staging/r8188eu/core/rtw_xmit.c +2 -2
@@ -1794,7 +1794,7 @@ s32 rtw_xmit(struct adapter *padapter, struct sk_buff **ppkt)spin_unlock_bh (&pxmitpriv->lock);#endif -if (rtw_hal_xmit (padapter, pxmitframe) == false) +if (!rtw_hal_xmit (padapter, pxmitframe))return 1 ;return 0 ;
@@ -1811,7 +1811,7 @@ int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_frastruct mlme_priv *pmlmepriv = &padapter->mlmepriv;int bmcst =IS_MCAST (pattrib->ra); -if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) == false) +if (!check_fwstate (pmlmepriv,WIFI_AP_STATE ))return ret;if (pattrib->psta)
drivers/staging/r8188eu/hal/odm.c +3 -3
@@ -606,7 +606,7 @@ void odm_DIG(struct odm_dm_struct *pDM_Odm)return ;/* add by Neil Chen to avoid PSD is processing */ -if (pDM_Odm->bDMInitialGainEnable == false) +if (!pDM_Odm->bDMInitialGainEnable)return ;if (pDM_Odm->SupportICType ==ODM_RTL8192D ) {
@@ -1342,8 +1342,8 @@ static void FindMinimumRSSI(struct adapter *pAdapter)struct mlme_priv *pmlmepriv = &pAdapter->mlmepriv;/* 1 1.Determine the minimum RSSI */ -if ((check_fwstate (pmlmepriv, _FW_LINKED) == false) && - (pdmpriv->EntryMinUndecoratedSmoothedPWDB ==0 )) +if (!check_fwstate (pmlmepriv, _FW_LINKED) && + pdmpriv->EntryMinUndecoratedSmoothedPWDB ==0 ) pdmpriv->MinUndecoratedPWDBForDM =0 ;if (check_fwstate (pmlmepriv, _FW_LINKED))/* Default port */ pdmpriv->MinUndecoratedPWDBForDM = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +1 -1
@@ -1262,7 +1262,7 @@ static int hal_EfusePgPacketRead_8188e(struct adapter *pAdapter, u8 offset, u8 * bDataEmpty = false; } } -if (bDataEmpty == false) { +if (!bDataEmpty) { ReadState =PG_STATE_DATA ; }else {/* read next header */ efuse_addr = efuse_addr + (word_cnts *2 ) +1 ;
drivers/staging/r8188eu/hal/rtl8188e_mp.c +1 -1
@@ -511,7 +511,7 @@ s32 Hal_SetThermalMeter(struct adapter *pAdapter, u8 target_ther)if (!netif_running (pAdapter->pnetdev))return _FAIL; -if (check_fwstate (&pAdapter->mlmepriv,WIFI_MP_STATE ) == false) +if (!check_fwstate (&pAdapter->mlmepriv,WIFI_MP_STATE ))return _FAIL; target_ther &=0xff ;
drivers/staging/r8188eu/hal/usb_halinit.c +1 -1
@@ -1065,7 +1065,7 @@ static unsigned int rtl8188eu_inirp_init(struct adapter *Adapter)/* issue Rx irp to receive data */ precvbuf = (struct recv_buf *)precvpriv->precv_buf;for (i =0 ; i <NR_RECVBUFF ; i++) { -if (_read_port (pintfhdl, precvpriv->ff_hwaddr,0 , (unsigned char *)precvbuf) == false) { +if (!_read_port (pintfhdl, precvpriv->ff_hwaddr,0 , (unsigned char *)precvbuf)) { status = _FAIL; goto exit; }
drivers/staging/r8188eu/os_dep/ioctl_linux.c +4 -4
@@ -820,7 +820,7 @@ static int rtw_wx_set_mode(struct net_device *dev, struct iw_request_info *a, ret = -EINVAL ; goto exit; } -if (rtw_set_802_11_infrastructure_mode (padapter, networkType) == false) { +if (!rtw_set_802_11_infrastructure_mode (padapter, networkType)) { ret = -EPERM ; goto exit; }
@@ -1088,7 +1088,7 @@ static int rtw_wx_set_wap(struct net_device *dev,rtw_set_802_11_authentication_mode (padapter, authmode);/* set_802_11_encryption_mode(padapter, padapter->securitypriv.ndisencryptstatus); */ -if (rtw_set_802_11_bssid (padapter, temp->sa_data) == false) { +if (!rtw_set_802_11_bssid (padapter, temp->sa_data)) { ret =-1 ; goto exit; }
@@ -1461,7 +1461,7 @@ static int rtw_wx_set_essid(struct net_device *dev, }spin_unlock_bh (&queue->lock);rtw_set_802_11_authentication_mode (padapter, authmode); -if (rtw_set_802_11_ssid (padapter, &ndis_ssid) == false) { +if (!rtw_set_802_11_ssid (padapter, &ndis_ssid)) { ret =-1 ; goto exit; }
@@ -1797,7 +1797,7 @@ static int rtw_wx_set_enc(struct net_device *dev,memcpy (wep.KeyMaterial, keybuf, wep.KeyLength); -if (rtw_set_802_11_add_wep (padapter, &wep) == false) { +if (!rtw_set_802_11_add_wep (padapter, &wep)) {if (rf_on == pwrpriv->rf_pwrstate) ret = -EOPNOTSUPP ; goto exit;
drivers/staging/r8188eu/os_dep/xmit_linux.c +1 -1
@@ -222,7 +222,7 @@ int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)struct mlme_priv *pmlmepriv = &padapter->mlmepriv;s32 res =0 ; -if (rtw_if_up (padapter) == false) +if (!rtw_if_up (padapter)) goto drop_packet;rtw_check_xmit_resource (padapter, pkt);
Signature · 1 line
2.32.0