Commit f6fe0a41 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

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



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 95ddd225

drivers/staging/rtl8723au/core/rtw_wlan_util.c

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

drivers/staging/rtl8723au/include/rtw_mlme_ext.h

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