Commit c87d8e90 authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: drop return value from receive_disconnect 



The receive_disconnect function always returns _SUCCESS. None of the
callers checks the return value. We can remove it.

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220626180734.287137-1-martin@kaiser.cx


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent df8d0a55

drivers/staging/r8188eu/core/rtw_mlme_ext.c

+2 −3
Original line number Diff line number Diff line
@@ -6191,14 +6191,14 @@ void start_clnt_assoc(struct adapter *padapter) 
	set_link_timer(pmlmeext, REASSOC_TO);

}



unsigned int receive_disconnect(struct adapter *padapter, unsigned char *MacAddr, unsigned short reason)

void receive_disconnect(struct adapter *padapter, unsigned char *MacAddr, unsigned short reason)

{

	struct mlme_ext_priv	*pmlmeext = &padapter->mlmeextpriv;

	struct mlme_ext_info	*pmlmeinfo = &pmlmeext->mlmext_info;



	/* check A3 */

	if (!(!memcmp(MacAddr, get_my_bssid(&pmlmeinfo->network), ETH_ALEN)))

		return _SUCCESS;

		return;



	if ((pmlmeinfo->state & 0x03) == WIFI_FW_STATION_STATE) {

		if (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) {
@@ -6209,7 +6209,6 @@ unsigned int receive_disconnect(struct adapter *padapter, unsigned char *MacAddr 
			report_join_res(padapter, -2);

		}

	}

	return _SUCCESS;

}



static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid)

drivers/staging/r8188eu/include/rtw_mlme_ext.h

+1 −2
Original line number Diff line number Diff line
@@ -468,8 +468,7 @@ unsigned int update_MSC_rate(struct HT_caps_element *pHT_caps); 
void Update_RA_Entry(struct adapter *padapter, u32 mac_id);

void set_sta_rate(struct adapter *padapter, struct sta_info *psta);



unsigned int receive_disconnect(struct adapter *padapter,

				unsigned char *macaddr, unsigned short reason);

void receive_disconnect(struct adapter *padapter, unsigned char *macaddr, unsigned short reason);



unsigned char get_highest_rate_idx(u32 mask);

int support_short_GI(struct adapter *padapter, struct HT_caps_element *caps);