staging: rtl8723au: rtw_wlan_util.c: Fix up random mixing of bool vs int

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/core/rtw_wlan_util.c b/drivers/staging/rtl8723au/core/rtw_wlan_util.c
index efdd0dd1803698992d3bbd0279bf8595c2ba9b5e..c4c47164b990a13616314956bacaae3742301afe 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723au/core/rtw_wlan_util.c
@@ -415,13 +415,13 @@ u16 get_beacon_interval23a(struct wlan_bssid_ex *bss)
        return le16_to_cpu(val);
 }
 
-int is_client_associated_to_ap23a(struct rtw_adapter *padapter)
+bool is_client_associated_to_ap23a(struct rtw_adapter *padapter)
 {
        struct mlme_ext_priv *pmlmeext;
        struct mlme_ext_info *pmlmeinfo;
 
        if (!padapter)
-               return _FAIL;
+               return false;
 
        pmlmeext = &padapter->mlmeextpriv;
        pmlmeinfo = &pmlmeext->mlmext_info;
@@ -430,10 +430,10 @@ int is_client_associated_to_ap23a(struct rtw_adapter *padapter)
            (pmlmeinfo->state & 0x03) == WIFI_FW_STATION_STATE)
                return true;
        else
-               return _FAIL;
+               return false;
 }
 
-int is_client_associated_to_ibss23a(struct rtw_adapter *padapter)
+bool is_client_associated_to_ibss23a(struct rtw_adapter *padapter)
 {
        struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
        struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
@@ -442,10 +442,10 @@ int is_client_associated_to_ibss23a(struct rtw_adapter *padapter)
            (pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE)
                return true;
        else
-               return _FAIL;
+               return false;
 }
 
-int is_IBSS_empty23a(struct rtw_adapter *padapter)
+bool is_IBSS_empty23a(struct rtw_adapter *padapter)
 {
        unsigned int i;
        struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@@ -453,7 +453,7 @@ int is_IBSS_empty23a(struct rtw_adapter *padapter)
 
        for (i = IBSS_START_MAC_ID; i < NUM_STA; i++) {
                if (pmlmeinfo->FW_sta_info[i].status == 1)
-                       return _FAIL;
+                       return false;
        }
 
        return true;

diff --git a/drivers/staging/rtl8723au/include/rtw_mlme_ext.h b/drivers/staging/rtl8723au/include/rtw_mlme_ext.h
index 80e093fea272953bc53e5e40e693449f58689e1e..346ee16ca248c6e7bdf58e20ca9938a53e613645 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8723au/include/rtw_mlme_ext.h
@@ -508,9 +508,9 @@ int get_bsstype23a(unsigned short capability);
 u8 *get_my_bssid23a(struct wlan_bssid_ex *pnetwork);
 u16 get_beacon_interval23a(struct wlan_bssid_ex *bss);
 
-int is_client_associated_to_ap23a(struct rtw_adapter *padapter);
-int is_client_associated_to_ibss23a(struct rtw_adapter *padapter);
-int is_IBSS_empty23a(struct rtw_adapter *padapter);
+bool is_client_associated_to_ap23a(struct rtw_adapter *padapter);
+bool is_client_associated_to_ibss23a(struct rtw_adapter *padapter);
+bool is_IBSS_empty23a(struct rtw_adapter *padapter);
 
 unsigned char check_assoc_AP23a(u8 *pframe, uint len);