]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
staging: rtl8723bs: core: simplify boolean comparisons
authorAndrei Khomenkov <khomenkov@mailbox.org>
Mon, 27 Apr 2026 17:58:39 +0000 (20:58 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 4 May 2026 14:52:06 +0000 (16:52 +0200)
Simplify boolean comparisons to improve readability
and conform to the Linux kernel coding style.

Signed-off-by: Andrei Khomenkov <khomenkov@mailbox.org>
Link: https://patch.msgid.link/20260427175846.23470-2-khomenkov@mailbox.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723bs/core/rtw_ap.c
drivers/staging/rtl8723bs/core/rtw_btcoex.c
drivers/staging/rtl8723bs/core/rtw_cmd.c
drivers/staging/rtl8723bs/core/rtw_ieee80211.c
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
drivers/staging/rtl8723bs/core/rtw_mlme.c
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
drivers/staging/rtl8723bs/core/rtw_recv.c
drivers/staging/rtl8723bs/core/rtw_sta_mgt.c
drivers/staging/rtl8723bs/core/rtw_wlan_util.c
drivers/staging/rtl8723bs/core/rtw_xmit.c

index 0fc41ae47fb05dc16e7c5789ce44d50f386c297e..75d790e1b5c502614c3f3dc96194df5c54def746 100644 (file)
@@ -297,7 +297,7 @@ void expire_timeout_chk(struct adapter *padapter)
 
                        psta->keep_alive_trycnt = 0;
                        spin_lock_bh(&pstapriv->asoc_list_lock);
-                       if (list_empty(&psta->asoc_list) == false) {
+                       if (!list_empty(&psta->asoc_list)) {
                                list_del_init(&psta->asoc_list);
                                pstapriv->asoc_list_cnt--;
                                updated = ap_free_sta(padapter, psta, false,
index 38937ba837f2ccd5d17feb512f4e1d5bdd112499..9e00424d00bdda179d504a664c7d0946e1d2a695 100644 (file)
@@ -11,7 +11,7 @@
 void rtw_btcoex_media_status_notify(struct adapter *padapter, u8 media_status)
 {
        if ((media_status == RT_MEDIA_CONNECT) &&
-           (check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) == true)) {
+           check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE)) {
                rtw_hal_set_hwreg(padapter, HW_VAR_DL_RSVD_PAGE, NULL);
        }
 
index 3fc9406e421cd228a71991a1e7557064ccdedbe5..f6e61867529989c92c74e5877b0e0b1ce535bf4a 100644 (file)
@@ -696,7 +696,7 @@ u8 rtw_joinbss_cmd(struct adapter  *padapter, struct wlan_network *pnetwork)
        t_len = sizeof(struct wlan_bssid_ex);
 
        /* for hidden ap to set fw_state here */
-       if (check_fwstate(pmlmepriv, WIFI_STATION_STATE | WIFI_ADHOC_STATE) != true) {
+       if (!check_fwstate(pmlmepriv, WIFI_STATION_STATE | WIFI_ADHOC_STATE)) {
                switch (ndis_network_mode) {
                case Ndis802_11IBSS:
                        set_fwstate(pmlmepriv, WIFI_ADHOC_STATE);
index 5fb1fe5b72b309a9914e0382d32a2806a101f7ad..d0bbe1bb979c863cbc1503ffd1ba2f3ef4faf940 100644 (file)
@@ -347,7 +347,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv)
 
        /* HT Cap. */
        if ((pregistrypriv->wireless_mode & WIRELESS_11_24N) &&
-           (pregistrypriv->ht_enable == true)) {
+           pregistrypriv->ht_enable) {
                /* todo: */
        }
 
index 3cc2a7c9d27f4f25a55b385beb86517015758811..ebf0808f41046434a139f10740b3d4308f896da4 100644 (file)
@@ -80,7 +80,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... */
@@ -137,32 +137,32 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)
        netdev_dbg(padapter->pnetdev, "set ssid [%s] fw_state = 0x%08x\n",
                   ssid->ssid, get_fwstate(pmlmepriv));
 
-       if (padapter->hw_init_completed == false) {
+       if (!padapter->hw_init_completed) {
                status = _FAIL;
                goto exit;
        }
 
        spin_lock_bh(&pmlmepriv->lock);
 
-       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;
 
-       if (check_fwstate(pmlmepriv, _FW_LINKED | WIFI_ADHOC_MASTER_STATE) == true) {
+       if (check_fwstate(pmlmepriv, _FW_LINKED | WIFI_ADHOC_MASTER_STATE)) {
                if ((pmlmepriv->assoc_ssid.ssid_length == ssid->ssid_length) &&
                    (!memcmp(&pmlmepriv->assoc_ssid.ssid, ssid->ssid, ssid->ssid_length))) {
-                       if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == false) {
-                               if (rtw_is_same_ibss(padapter, pnetwork) == false) {
+                       if (!check_fwstate(pmlmepriv, WIFI_STATION_STATE)) {
+                               if (!rtw_is_same_ibss(padapter, pnetwork)) {
                                        /* 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);
                                        }
@@ -175,12 +175,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);
                        }
@@ -193,7 +193,7 @@ handle_tkip_countermeasure:
                goto release_mlme_lock;
        }
 
-       if (rtw_validate_ssid(ssid) == false) {
+       if (!rtw_validate_ssid(ssid)) {
                status = _FAIL;
                goto release_mlme_lock;
        }
@@ -201,7 +201,7 @@ handle_tkip_countermeasure:
        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);
@@ -221,10 +221,10 @@ u8 rtw_set_802_11_connect(struct adapter *padapter, u8 *bssid, struct ndis_802_1
        bool ssid_valid = true;
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 
-       if (!ssid || rtw_validate_ssid(ssid) == false)
+       if (!ssid || !rtw_validate_ssid(ssid))
                ssid_valid = false;
 
-       if (!bssid || rtw_validate_bssid(bssid) == false)
+       if (!bssid || !rtw_validate_bssid(bssid))
                bssid_valid = false;
 
        if (!ssid_valid && !bssid_valid) {
@@ -232,7 +232,7 @@ u8 rtw_set_802_11_connect(struct adapter *padapter, u8 *bssid, struct ndis_802_1
                goto exit;
        }
 
-       if (padapter->hw_init_completed == false) {
+       if (!padapter->hw_init_completed) {
                status = _FAIL;
                goto exit;
        }
@@ -242,9 +242,9 @@ u8 rtw_set_802_11_connect(struct adapter *padapter, u8 *bssid, struct ndis_802_1
        netdev_dbg(padapter->pnetdev, FUNC_ADPT_FMT "  fw_state = 0x%08x\n",
                   FUNC_ADPT_ARG(padapter), 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;
 
 handle_tkip_countermeasure:
@@ -265,7 +265,7 @@ handle_tkip_countermeasure:
                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);
@@ -294,15 +294,15 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,
 
                spin_lock_bh(&pmlmepriv->lock);
 
-               if ((check_fwstate(pmlmepriv, _FW_LINKED) == true) || (*pold_state == Ndis802_11IBSS))
+               if (check_fwstate(pmlmepriv, _FW_LINKED) || (*pold_state == Ndis802_11IBSS))
                        rtw_disassoc_cmd(padapter, 0, true);
 
-               if ((check_fwstate(pmlmepriv, _FW_LINKED) == true) ||
-                       (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true))
+               if (check_fwstate(pmlmepriv, _FW_LINKED) ||
+                       check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))
                        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 checked whether issue dis-assoc_cmd or not */
                }
 
@@ -344,7 +344,7 @@ u8 rtw_set_802_11_disassociate(struct adapter *padapter)
 
        spin_lock_bh(&pmlmepriv->lock);
 
-       if (check_fwstate(pmlmepriv, _FW_LINKED) == true) {
+       if (check_fwstate(pmlmepriv, _FW_LINKED)) {
                rtw_disassoc_cmd(padapter, 0, true);
                rtw_indicate_disconnect(padapter);
                /* modify for CONFIG_IEEE80211W, none 11w can use it */
@@ -366,7 +366,7 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_s
                res = false;
                goto exit;
        }
-       if (padapter->hw_init_completed == false) {
+       if (!padapter->hw_init_completed) {
                res = false;
                goto exit;
        }
@@ -467,8 +467,8 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter)
        struct sta_info *psta = NULL;
        u8 short_GI = 0;
 
-       if ((check_fwstate(pmlmepriv, _FW_LINKED) != true)
-               && (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) != true))
+       if (!check_fwstate(pmlmepriv, _FW_LINKED)
+               && !check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))
                return 0;
 
        psta = rtw_get_stainfo(&adapter->stapriv, get_bssid(pmlmepriv));
index 3ecf4f979c0341383a8c09dc907e8e3e784b875a..14a6d0e2a3c16a04b9fb7a933db0bedc755973bf 100644 (file)
@@ -1272,7 +1272,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 (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
@@ -1556,7 +1556,7 @@ void rtw_mlme_reset_auto_scan_int(struct adapter *adapter)
 
        if (pmlmeinfo->VHT_enable) /* disable auto scan when connect to 11AC AP */
                mlme->auto_scan_int_ms = 0;
-       else if (adapter->registrypriv.wifi_spec && is_client_associated_to_ap(adapter) == true)
+       else if (adapter->registrypriv.wifi_spec && is_client_associated_to_ap(adapter))
                mlme->auto_scan_int_ms = 60 * 1000;
        else if (rtw_chk_roam_flags(adapter, RTW_ROAM_ACTIVE)) {
                if (check_fwstate(mlme, WIFI_STATION_STATE) && check_fwstate(mlme, _FW_LINKED))
@@ -1658,10 +1658,10 @@ static int rtw_check_roaming_candidate(struct mlme_priv *mlme
        int updated = false;
        struct adapter *adapter = container_of(mlme, struct adapter, mlmepriv);
 
-       if (is_same_ess(&competitor->network, &mlme->cur_network.network) == false)
+       if (!is_same_ess(&competitor->network, &mlme->cur_network.network))
                goto exit;
 
-       if (rtw_is_desired_network(adapter, competitor) == false)
+       if (!rtw_is_desired_network(adapter, competitor))
                goto exit;
 
        /* got specific addr to roam */
@@ -1753,12 +1753,12 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme
                        goto exit;
        }
 
-       if (rtw_is_desired_network(adapter, competitor)  == false)
+       if (!rtw_is_desired_network(adapter, competitor))
                goto exit;
 
        if (rtw_to_roam(adapter) > 0) {
                if (jiffies_to_msecs(jiffies - competitor->last_scanned) >= mlme->roam_scanr_exp_ms
-                       || is_same_ess(&competitor->network, &mlme->cur_network.network) == false
+                       || !is_same_ess(&competitor->network, &mlme->cur_network.network)
                )
                        goto exit;
        }
index 351f66e1ecbc8b2d63824d90152e096bd9af5ea7..e47ede86836cf8833aa6b05111bb1c31055398f7 100644 (file)
@@ -512,8 +512,8 @@ unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame)
        if (check_fwstate(pmlmepriv, WIFI_STATION_STATE))
                return _SUCCESS;
 
-       if (check_fwstate(pmlmepriv, _FW_LINKED) == false &&
-               check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE|WIFI_AP_STATE) == false) {
+       if (!check_fwstate(pmlmepriv, _FW_LINKED) &&
+               !check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE|WIFI_AP_STATE)) {
                return _SUCCESS;
        }
 
@@ -724,7 +724,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)
                goto auth_fail;
        }
 
-       if (rtw_access_ctrl(padapter, sa) == false) {
+       if (!rtw_access_ctrl(padapter, sa)) {
                status = WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA;
                goto auth_fail;
        }
@@ -747,7 +747,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)
        } else {
 
                spin_lock_bh(&pstapriv->asoc_list_lock);
-               if (list_empty(&pstat->asoc_list) == false) {
+               if (!list_empty(&pstat->asoc_list)) {
                        list_del_init(&pstat->asoc_list);
                        pstapriv->asoc_list_cnt--;
                        if (pstat->expire_to > 0) {
@@ -1229,7 +1229,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
        } else
                pstat->flags &= ~WLAN_STA_HT;
 
-       if ((pmlmepriv->htpriv.ht_option == false) && (pstat->flags&WLAN_STA_HT)) {
+       if (!pmlmepriv->htpriv.ht_option && (pstat->flags&WLAN_STA_HT)) {
                status = WLAN_STATUS_CHALLENGE_FAIL;
                goto OnAssocReqFail;
        }
@@ -1461,7 +1461,7 @@ unsigned int OnDeAuth(struct adapter *padapter, union recv_frame *precv_frame)
                        u8 updated = false;
 
                        spin_lock_bh(&pstapriv->asoc_list_lock);
-                       if (list_empty(&psta->asoc_list) == false) {
+                       if (!list_empty(&psta->asoc_list)) {
                                list_del_init(&psta->asoc_list);
                                pstapriv->asoc_list_cnt--;
                                updated = ap_free_sta(padapter, psta, false, reason);
@@ -1532,7 +1532,7 @@ unsigned int OnDisassoc(struct adapter *padapter, union recv_frame *precv_frame)
                        u8 updated = false;
 
                        spin_lock_bh(&pstapriv->asoc_list_lock);
-                       if (list_empty(&psta->asoc_list) == false) {
+                       if (!list_empty(&psta->asoc_list)) {
                                list_del_init(&psta->asoc_list);
                                pstapriv->asoc_list_cnt--;
                                updated = ap_free_sta(padapter, psta, false, reason);
@@ -4909,7 +4909,7 @@ void linked_status_chk(struct adapter *padapter)
                /*  todo: To check why we under miracast session, rx_chk would be false */
                psta = rtw_get_stainfo(pstapriv, pmlmeinfo->network.mac_address);
                if (psta) {
-                       if (chk_ap_is_alive(padapter, psta) == false)
+                       if (!chk_ap_is_alive(padapter, psta))
                                rx_chk = _FAIL;
 
                        if (pxmitpriv->last_tx_pkts == pxmitpriv->tx_pkts)
index e11127992cfd137d14df4537285fb253c03094b1..098a08c11fe5cde6ad3ee3cb4e3bdfd0bc445ff0 100644 (file)
@@ -373,7 +373,7 @@ static signed int recvframe_chkmic(struct adapter *adapter,  union recv_frame *p
 
                                /* psecuritypriv->dot118021XGrpKeyid, pmlmeinfo->key_index, rxdata_key_idx); */
 
-                               if (psecuritypriv->binstallGrpkey == false) {
+                               if (!psecuritypriv->binstallGrpkey) {
                                        res = _FAIL;
                                        goto exit;
                                }
@@ -396,10 +396,10 @@ static signed int recvframe_chkmic(struct adapter *adapter,  union recv_frame *p
                                        bmic_err = true;
                        }
 
-                       if (bmic_err == true) {
+                       if (bmic_err) {
                                /*  double check key_index for some timing issue , */
                                /*  cannot compare with psecuritypriv->dot118021XGrpKeyid also cause timing issue */
-                               if ((is_multicast_ether_addr(prxattrib->ra) == true)  && (prxattrib->key_index != pmlmeinfo->key_index))
+                               if (is_multicast_ether_addr(prxattrib->ra)  && (prxattrib->key_index != pmlmeinfo->key_index))
                                        brpt_micerror = false;
 
                                if (prxattrib->bdecrypted && brpt_micerror)
@@ -453,7 +453,7 @@ static union recv_frame *decryptor(struct adapter *padapter, union recv_frame *p
                }
        }
 
-       if ((prxattrib->encrypt > 0) && ((prxattrib->bdecrypted == 0) || (psecuritypriv->sw_decrypt == true))) {
+       if ((prxattrib->encrypt > 0) && ((prxattrib->bdecrypted == 0) || psecuritypriv->sw_decrypt)) {
                psecuritypriv->hw_decrypted = false;
 
                switch (prxattrib->encrypt) {
@@ -703,8 +703,8 @@ static signed int sta2sta_data_frame(struct adapter *adapter, union recv_frame *
        u8 *sta_addr = NULL;
        signed int bmcast = 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)) {
@@ -726,7 +726,7 @@ static signed int sta2sta_data_frame(struct adapter *adapter, union recv_frame *
 
                sta_addr = pattrib->src;
 
-       } else if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) {
+       } else if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) {
                /*  For Station mode, sa and bssid should always be BSSID, and DA is my mac-address */
                if (memcmp(pattrib->bssid, pattrib->src, ETH_ALEN)) {
                        ret = _FAIL;
@@ -734,7 +734,7 @@ static signed int sta2sta_data_frame(struct adapter *adapter, union recv_frame *
                }
 
                sta_addr = pattrib->bssid;
-       } else if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) {
+       } else if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
                if (bmcast) {
                        /*  For AP mode, if DA == MCAST, then BSSID should be also MCAST */
                        if (!is_multicast_ether_addr(pattrib->bssid)) {
@@ -751,7 +751,7 @@ static signed int sta2sta_data_frame(struct adapter *adapter, union recv_frame *
                        sta_addr = pattrib->src;
                }
 
-       } else if (check_fwstate(pmlmepriv, WIFI_MP_STATE) == true) {
+       } else if (check_fwstate(pmlmepriv, WIFI_MP_STATE)) {
                memcpy(pattrib->dst, GetAddr1Ptr(ptr), ETH_ALEN);
                memcpy(pattrib->src, GetAddr2Ptr(ptr), ETH_ALEN);
                memcpy(pattrib->bssid, GetAddr3Ptr(ptr), ETH_ALEN);
@@ -788,10 +788,9 @@ static signed int ap2sta_data_frame(struct adapter *adapter, union recv_frame *p
        u8 *myhwaddr = myid(&adapter->eeprompriv);
        signed int bmcast = is_multicast_ether_addr(pattrib->dst);
 
-       if ((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) &&
-           (check_fwstate(pmlmepriv, _FW_LINKED) == true ||
-            check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == 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)) {
@@ -834,8 +833,8 @@ static signed int ap2sta_data_frame(struct adapter *adapter, union recv_frame *p
                        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);
@@ -851,7 +850,7 @@ static signed int ap2sta_data_frame(struct adapter *adapter, union recv_frame *p
                        goto exit;
                }
 
-       } else if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) {
+       } else if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
                /* Special case */
                ret = RTW_RX_HANDLED;
                goto exit;
@@ -888,7 +887,7 @@ static signed int sta2ap_data_frame(struct adapter *adapter, union recv_frame *p
        unsigned char *mybssid  = get_bssid(pmlmepriv);
        signed 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;
@@ -1392,7 +1391,7 @@ static signed int validate_80211w_mgmt(struct adapter *adapter, union recv_frame
 
        /* only support station mode */
        if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED) &&
-           adapter->securitypriv.binstallBIPkey == true) {
+           adapter->securitypriv.binstallBIPkey) {
                /* unicast management frame decrypt */
                if (pattrib->privacy && !(is_multicast_ether_addr(GetAddr1Ptr(ptr))) &&
                        (subtype == WIFI_DEAUTH || subtype == WIFI_DISASSOC || subtype == WIFI_ACTION)) {
@@ -1576,7 +1575,7 @@ static signed int wlanhdr_to_ethhdr(union recv_frame *precvframe)
        eth_type = ntohs(be_tmp); /* pattrib->ether_type */
        pattrib->eth_type = eth_type;
 
-       if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == true)) {
+       if (check_fwstate(pmlmepriv, WIFI_MP_STATE)) {
                ptr += rmv_len;
                *ptr = 0x87;
                *(ptr + 1) = 0x12;
@@ -1651,7 +1650,7 @@ static void rtw_recv_indicate_pkt(struct adapter *padapter, struct sk_buff *pkt,
 
        /* Indicate the packets to upper layer */
        if (pkt) {
-               if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) {
+               if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
                        struct sk_buff *pskb2 = NULL;
                        struct sta_info *psta = NULL;
                        struct sta_priv *pstapriv = &padapter->stapriv;
@@ -1892,7 +1891,7 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reor
        plist = get_next(phead);
 
        /*  Handling some condition for forced indicate case. */
-       if (bforced == true) {
+       if (bforced) {
                if (list_empty(phead)) {
                        /*  spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql); */
                        /* spin_unlock(&ppending_recvframe_queue->lock); */
@@ -1927,8 +1926,8 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reor
 
                        /* indicate this recv_frame */
                        if (!pattrib->amsdu) {
-                               if ((padapter->bDriverStopped == false) &&
-                                   (padapter->bSurpriseRemoved == false))
+                               if (!padapter->bDriverStopped &&
+                                   !padapter->bSurpriseRemoved)
                                        rtw_recv_indicatepkt(padapter, prframe);/* indicate this recv_frame */
 
                        } else if (pattrib->amsdu == 1) {
@@ -1967,8 +1966,8 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *
                wlanhdr_to_ethhdr(prframe);
 
                if (pattrib->qos != 1) {
-                       if ((padapter->bDriverStopped == false) &&
-                           (padapter->bSurpriseRemoved == false)) {
+                       if (!padapter->bDriverStopped &&
+                           !padapter->bSurpriseRemoved) {
                                rtw_recv_indicatepkt(padapter, prframe);
                                return _SUCCESS;
 
@@ -1978,7 +1977,7 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *
 
                }
 
-               if (preorder_ctrl->enable == false) {
+               if (!preorder_ctrl->enable) {
                        /* indicate this recv_frame */
                        preorder_ctrl->indicate_seq = pattrib->seq_num;
 
@@ -1989,7 +1988,7 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *
                        return _SUCCESS;
                }
        } else if (pattrib->amsdu == 1) { /* temp filter -> means didn't support A-MSDUs in a A-MPDU */
-               if (preorder_ctrl->enable == false) {
+               if (!preorder_ctrl->enable) {
                        preorder_ctrl->indicate_seq = pattrib->seq_num;
 
                        retval = amsdu_to_msdu(padapter, prframe);
@@ -2024,7 +2023,7 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *
        /*  */
 
        /* recv_indicatepkts_in_order(padapter, preorder_ctrl, true); */
-       if (recv_indicatepkts_in_order(padapter, preorder_ctrl, false) == true) {
+       if (recv_indicatepkts_in_order(padapter, preorder_ctrl, false)) {
                _set_timer(&preorder_ctrl->reordering_ctrl_timer, REORDER_WAIT_TIME);
                spin_unlock_bh(&ppending_recvframe_queue->lock);
        } else {
@@ -2052,7 +2051,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))
                _set_timer(&preorder_ctrl->reordering_ctrl_timer, REORDER_WAIT_TIME);
 
        spin_unlock_bh(&ppending_recvframe_queue->lock);
@@ -2067,13 +2066,13 @@ static int process_recv_indicatepkts(struct adapter *padapter, union recv_frame
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
        struct ht_priv *phtpriv = &pmlmepriv->htpriv;
 
-       if (phtpriv->ht_option == true) { /* B/G/N Mode */
+       if (phtpriv->ht_option) { /* B/G/N Mode */
                /* prframe->u.hdr.preorder_ctrl = &precvpriv->recvreorder_ctrl[pattrib->priority]; */
 
                if (recv_indicatepkt_reorder(padapter, prframe) != _SUCCESS) { /*  including perform A-MPDU Rx Ordering Buffer Control */
 
-                       if ((padapter->bDriverStopped == false) &&
-                           (padapter->bSurpriseRemoved == false)) {
+                       if (!padapter->bDriverStopped &&
+                           !padapter->bSurpriseRemoved) {
                                retval = _FAIL;
                                return retval;
                        }
@@ -2083,7 +2082,7 @@ static int process_recv_indicatepkts(struct adapter *padapter, union recv_frame
                if (retval != _SUCCESS)
                        return retval;
 
-               if ((padapter->bDriverStopped == false) && (padapter->bSurpriseRemoved == false)) {
+               if (!padapter->bDriverStopped && !padapter->bSurpriseRemoved) {
                        /* indicate this recv_frame */
                        rtw_recv_indicatepkt(padapter, prframe);
                } else {
@@ -2172,7 +2171,7 @@ static int recv_func(struct adapter *padapter, union recv_frame *rframe)
                /* check if need to enqueue into uc_swdec_pending_queue*/
                if (check_fwstate(mlmepriv, WIFI_STATION_STATE) &&
                        !is_multicast_ether_addr(prxattrib->ra) && prxattrib->encrypt > 0 &&
-                       (prxattrib->bdecrypted == 0 || psecuritypriv->sw_decrypt == true) &&
+                       (prxattrib->bdecrypted == 0 || psecuritypriv->sw_decrypt) &&
                        psecuritypriv->ndisauthtype == Ndis802_11AuthModeWPAPSK &&
                        !psecuritypriv->busetkipkey) {
                        rtw_enqueue_recvframe(rframe, &padapter->recvpriv.uc_swdec_pending_queue);
@@ -2258,8 +2257,8 @@ static void rtw_signal_stat_timer_hdl(struct timer_list *t)
                        }
                }
 
-               if (check_fwstate(&adapter->mlmepriv, _FW_UNDER_SURVEY) == true ||
-                   check_fwstate(&adapter->mlmepriv, _FW_LINKED) == false
+               if (check_fwstate(&adapter->mlmepriv, _FW_UNDER_SURVEY) ||
+                   !check_fwstate(&adapter->mlmepriv, _FW_LINKED)
                ) {
                        goto set_timer;
                }
index 1e5bc9f4cd4ba0a83f07ac451a5d9dad9f740026..a1b7fe843979ef3399db71524144084d8625b03b 100644 (file)
@@ -530,7 +530,7 @@ u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr)
                paclnode = list_entry(plist, struct rtw_wlan_acl_node, list);
 
                if (!memcmp(paclnode->addr, mac_addr, ETH_ALEN))
-                       if (paclnode->valid == true) {
+                       if (paclnode->valid) {
                                match = true;
                                break;
                        }
index cc1a7497764c9c7395bc6a382bf66818c5c31adb..4f41f88908d79752c3f12ea7f4f4e884567f4ab3 100644 (file)
@@ -147,7 +147,7 @@ unsigned int ratetbl2rateset(struct adapter *padapter, unsigned char *rateset)
                default:
                        rate = ratetbl_val_2wifirate(rate);
 
-                       if (is_basicrate(padapter, rate) == true)
+                       if (is_basicrate(padapter, rate))
                                rate |= IEEE80211_BASIC_RATE_MASK;
 
                        rateset[len] = rate;
@@ -236,7 +236,7 @@ void Restore_DM_Func_Flag(struct adapter *padapter)
 
 void Switch_DM_Func(struct adapter *padapter, u32 mode, u8 enable)
 {
-       if (enable == true)
+       if (enable)
                rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_SET, (u8 *)(&mode));
        else
                rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_CLR, (u8 *)(&mode));
@@ -846,7 +846,7 @@ static void bwmode_update_check(struct adapter *padapter, struct ndis_80211_var_
        if (!pIE)
                return;
 
-       if (phtpriv->ht_option == false)
+       if (!phtpriv->ht_option)
                return;
 
        if (pIE->length > sizeof(struct HT_info_element))
@@ -930,7 +930,7 @@ void HT_caps_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE)
        if (!pIE)
                return;
 
-       if (phtpriv->ht_option == false)
+       if (!phtpriv->ht_option)
                return;
 
        pmlmeinfo->HT_caps_enable = 1;
@@ -993,7 +993,7 @@ void HT_info_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE)
        if (!pIE)
                return;
 
-       if (phtpriv->ht_option == false)
+       if (!phtpriv->ht_option)
                return;
 
        if (pIE->length > sizeof(struct HT_info_element))
@@ -1121,7 +1121,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)
        struct mlme_priv *pmlmepriv = &Adapter->mlmepriv;
        int ssid_len;
 
-       if (is_client_associated_to_ap(Adapter) == false)
+       if (!is_client_associated_to_ap(Adapter))
                return true;
 
        len = packet_len - sizeof(struct ieee80211_hdr_3addr);
@@ -1688,7 +1688,7 @@ void adaptive_early_32k(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len)
                pmlmeext->bcn_delay_cnt[delay_ms]++;
                /* pmlmeext->bcn_delay_ratio[delay_ms] = (pmlmeext->bcn_delay_cnt[delay_ms] * 100) /pmlmeext->bcn_cnt; */
        /* dump for  adaptive_early_32k */
-       if (pmlmeext->bcn_cnt > 100 && (pmlmeext->adaptive_tsf_done == true)) {
+       if (pmlmeext->bcn_cnt > 100 && pmlmeext->adaptive_tsf_done) {
                u8 ratio_20_delay, ratio_80_delay;
                u8 DrvBcnEarly, DrvBcnTimeOut;
 
@@ -1736,7 +1736,7 @@ void rtw_alloc_macid(struct adapter *padapter, struct sta_info *psta)
 
        spin_lock_bh(&pdvobj->lock);
        for (i = 0; i < NUM_STA; i++) {
-               if (pdvobj->macid[i] == false) {
+               if (!pdvobj->macid[i]) {
                        pdvobj->macid[i]  = true;
                        break;
                }
@@ -1761,7 +1761,7 @@ void rtw_release_macid(struct adapter *padapter, struct sta_info *psta)
 
        spin_lock_bh(&pdvobj->lock);
        if (psta->mac_id < NUM_STA && psta->mac_id != 1) {
-               if (pdvobj->macid[psta->mac_id] == true) {
+               if (pdvobj->macid[psta->mac_id]) {
                        pdvobj->macid[psta->mac_id] = false;
                        psta->mac_id = NUM_STA;
                }
index dba146b696e07a4fa6865f6f1fa9bff19e2021a1..9ac8a8f743979ab66a3162cb9ab1b3d2070a04e4 100644 (file)
@@ -424,7 +424,7 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame *
        } else {
                while (true) {
                        /* IOT action */
-                       if ((pmlmeinfo->assoc_AP_vendor == HT_IOT_PEER_ATHEROS) && (pattrib->ampdu_en == true) &&
+                       if ((pmlmeinfo->assoc_AP_vendor == HT_IOT_PEER_ATHEROS) && pattrib->ampdu_en &&
                            (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_)) {
                                pattrib->vcs_mode = CTS_TO_SELF;
                                break;
@@ -460,7 +460,7 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame *
                        /* to do list: check MIMO power save condition. */
 
                        /* check AMPDU aggregation for TXOP */
-                       if (pattrib->ampdu_en == true) {
+                       if (pattrib->ampdu_en) {
                                pattrib->vcs_mode = RTS_CTS;
                                break;
                        }
@@ -522,10 +522,10 @@ static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *p
        memset(pattrib->dot11tkiptxmickey.skey,  0, 16);
        pattrib->mac_id = psta->mac_id;
 
-       if (psta->ieee8021x_blocked == true) {
+       if (psta->ieee8021x_blocked) {
                pattrib->encrypt = 0;
 
-               if ((pattrib->ether_type != 0x888e) && (check_fwstate(pmlmepriv, WIFI_MP_STATE) == false)) {
+               if ((pattrib->ether_type != 0x888e) && !check_fwstate(pmlmepriv, WIFI_MP_STATE)) {
                        res = _FAIL;
                        goto exit;
                }
@@ -690,8 +690,8 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
        memcpy(pattrib->dst, &etherhdr.h_dest, ETH_ALEN);
        memcpy(pattrib->src, &etherhdr.h_source, ETH_ALEN);
 
-       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)) {
                memcpy(pattrib->ra, pattrib->dst, ETH_ALEN);
                memcpy(pattrib->ta, pattrib->src, ETH_ALEN);
        } else if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) {
@@ -757,7 +757,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
                if (!psta)      { /*  if we cannot get psta => drop 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;
                }
@@ -939,7 +939,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr
        SetFrameSubType(fctrl, pattrib->subtype);
 
        if (pattrib->subtype & WIFI_DATA_TYPE) {
-               if (check_fwstate(pmlmepriv,  WIFI_STATION_STATE) == true) {
+               if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) {
                        /* to_ds = 1, fr_ds = 0; */
 
                        {
@@ -953,7 +953,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr
 
                        if (pqospriv->qos_option)
                                qos_option = true;
-               } else if (check_fwstate(pmlmepriv,  WIFI_AP_STATE) == true) {
+               } else if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
                        /* to_ds = 0, fr_ds = 1; */
                        SetFrDs(fctrl);
                        memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
@@ -962,8 +962,8 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr
 
                        if (pattrib->qos_en)
                                qos_option = true;
-               } else if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true) ||
-               (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true)) {
+               } else if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) ||
+               check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {
                        memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
                        memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
                        memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN);
@@ -1021,7 +1021,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr
                                                pattrib->ampdu_en = true;
 
                                /* re-check if enable ampdu by BA_starting_seqctrl */
-                               if (pattrib->ampdu_en == true) {
+                               if (pattrib->ampdu_en) {
                                        u16 tx_seq;
 
                                        tx_seq = psta->BA_starting_seqctrl[pattrib->priority & 0x0f];
@@ -1178,7 +1178,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct
 
                frg_inx++;
 
-               if (bmcst || (rtw_endofpktfile(&pktfile) == true)) {
+               if (bmcst || rtw_endofpktfile(&pktfile)) {
                        pattrib->nr_frags = frg_inx;
 
                        pattrib->last_txcmdsz = pattrib->hdrlen + pattrib->iv_len +
@@ -1204,7 +1204,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct
 
        xmitframe_swencrypt(padapter, pxmitframe);
 
-       if (bmcst == false)
+       if (!bmcst)
                update_attrib_vcs_info(padapter, pxmitframe);
        else
                pattrib->vcs_mode = NONE_VCS;
@@ -2001,14 +2001,14 @@ s32 rtw_xmit(struct adapter *padapter, struct sk_buff **ppkt)
        do_queue_select(padapter, &pxmitframe->attrib);
 
        spin_lock_bh(&pxmitpriv->lock);
-       if (xmitframe_enqueue_for_sleeping_sta(padapter, pxmitframe) == true) {
+       if (xmitframe_enqueue_for_sleeping_sta(padapter, pxmitframe)) {
                spin_unlock_bh(&pxmitpriv->lock);
                return 1;
        }
        spin_unlock_bh(&pxmitpriv->lock);
 
        /* pre_xmitframe */
-       if (rtw_hal_xmit(padapter, pxmitframe) == false)
+       if (!rtw_hal_xmit(padapter, pxmitframe))
                return 1;
 
        return 0;
@@ -2052,7 +2052,7 @@ signed int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct x
        signed int bmcst = is_multicast_ether_addr(pattrib->ra);
        bool update_tim = false;
 
-       if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == false)
+       if (!check_fwstate(pmlmepriv, WIFI_AP_STATE))
                return ret;
        psta = rtw_get_stainfo(&padapter->stapriv, pattrib->ra);
        if (pattrib->psta != psta)