Commit 7d955952 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove cckrates{only}_included() 



In rtw_ieee80211.c there are rtw_is_cckrates_included() and
rtw_is_cckratesonly_included() which have the same functionality as
cckrates_included() and cckrates_only_included() defined in
rtw_wlan_util.c. Remove the functions from rtw_wlan_util.c and use
those from rtw_ieee80211.c. Remove the now unused variable ratelen.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20200913162206.19477-1-straube.linux@gmail.com


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

drivers/staging/rtl8723bs/core/rtw_wlan_util.c

+3 −31
Original line number Diff line number Diff line
@@ -54,32 +54,6 @@ static u8 rtw_basic_rate_ofdm[3] = { 
	IEEE80211_OFDM_RATE_24MB | IEEE80211_BASIC_RATE_MASK

};



int cckrates_included(unsigned char *rate, int ratelen)

{

	int	i;



	for (i = 0; i < ratelen; i++) {

		if  ((((rate[i]) & 0x7f) == 2)	|| (((rate[i]) & 0x7f) == 4) ||

		     (((rate[i]) & 0x7f) == 11)  || (((rate[i]) & 0x7f) == 22))

			return true;

	}



	return false;

}



int cckratesonly_included(unsigned char *rate, int ratelen)

{

	int	i;



	for (i = 0; i < ratelen; i++) {

		if  ((((rate[i]) & 0x7f) != 2) && (((rate[i]) & 0x7f) != 4) &&

		     (((rate[i]) & 0x7f) != 11)  && (((rate[i]) & 0x7f) != 22))

			return false;

	}



	return true;

}



u8 networktype_to_raid_ex(struct adapter *adapter, struct sta_info *psta)

{

	u8 raid, cur_rf_type, rf_type = RF_1T1R;
@@ -1740,15 +1714,13 @@ void update_capinfo(struct adapter *Adapter, u16 updateCap) 


void update_wireless_mode(struct adapter *padapter)

{

	int ratelen, network_type = 0;

	int network_type = 0;

	u32 SIFS_Timer;

	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;

	struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);

	struct wlan_bssid_ex		*cur_network = &(pmlmeinfo->network);

	unsigned char 		*rate = cur_network->SupportedRates;



	ratelen = rtw_get_rateset_len(cur_network->SupportedRates);



	if ((pmlmeinfo->HT_info_enable) && (pmlmeinfo->HT_caps_enable))

		pmlmeinfo->HT_enable = 1;
@@ -1765,9 +1737,9 @@ void update_wireless_mode(struct adapter *padapter) 
		else if (pmlmeinfo->HT_enable)

			network_type = WIRELESS_11_24N;



		if ((cckratesonly_included(rate, ratelen)) == true)

		if (rtw_is_cckratesonly_included(rate))

			network_type |= WIRELESS_11B;

		else if ((cckrates_included(rate, ratelen)) == true)

		else if (rtw_is_cckrates_included(rate))

			network_type |= WIRELESS_11BG;

		else

			network_type |= WIRELESS_11G;

drivers/staging/rtl8723bs/include/rtw_mlme_ext.h

+0 −2
Original line number Diff line number Diff line
@@ -716,8 +716,6 @@ void sa_query_timer_hdl(struct timer_list *t); 
		DBG_871X("%s set_sa_query_timer(%p, %d)\n", __func__, (mlmeext), (ms)); \

		_set_timer(&(mlmeext)->sa_query_timer, (ms)); \

	} while (0)

extern int cckrates_included(unsigned char *rate, int ratelen);

extern int cckratesonly_included(unsigned char *rate, int ratelen);



extern void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addr);