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

staging: rtl8188eu: remove unused variable ratelen 



After the removal of cckrates_included() and cckrates_only_included()
from rtw_wlan_util.c the variable/parameter 'ratelen' is unused now.
Remove it from update_wireless_mode() and judge_network_type().

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


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

drivers/staging/rtl8188eu/core/rtw_wlan_util.c

+2 −4
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ unsigned char networktype_to_raid(unsigned char network_type) 
	}

}



u8 judge_network_type(struct adapter *padapter, unsigned char *rate, int ratelen)

u8 judge_network_type(struct adapter *padapter, unsigned char *rate)

{

	u8 network_type = 0;

	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@@ -1321,15 +1321,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;

drivers/staging/rtl8188eu/hal/usb_halinit.c

+2 −2
Original line number Diff line number Diff line
@@ -1893,7 +1893,7 @@ void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_level) 
	switch (mac_id) {

	case 0:/*  for infra mode */

		supportRateNum = rtw_get_rateset_len(cur_network->SupportedRates);

		networkType = judge_network_type(adapt, cur_network->SupportedRates, supportRateNum) & 0xf;

		networkType = judge_network_type(adapt, cur_network->SupportedRates) & 0xf;

		raid = networktype_to_raid(networkType);

		mask = update_supported_rate(cur_network->SupportedRates, supportRateNum);

		mask |= (pmlmeinfo->HT_enable) ? update_MSC_rate(&pmlmeinfo->HT_caps) : 0;
@@ -1911,7 +1911,7 @@ void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_level) 
		break;

	default: /* for each sta in IBSS */

		supportRateNum = rtw_get_rateset_len(pmlmeinfo->FW_sta_info[mac_id].SupportedRates);

		networkType = judge_network_type(adapt, pmlmeinfo->FW_sta_info[mac_id].SupportedRates, supportRateNum) & 0xf;

		networkType = judge_network_type(adapt, pmlmeinfo->FW_sta_info[mac_id].SupportedRates) & 0xf;

		raid = networktype_to_raid(networkType);

		mask = update_supported_rate(cur_network->SupportedRates, supportRateNum);

drivers/staging/rtl8188eu/include/rtw_mlme_ext.h

+1 −1
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ void init_addba_retry_timer(struct adapter *adapt, struct sta_info *sta); 
struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv);



unsigned char networktype_to_raid(unsigned char network_type);

u8 judge_network_type(struct adapter *padapter, unsigned char *rate, int len);

u8 judge_network_type(struct adapter *padapter, unsigned char *rate);

void get_rate_set(struct adapter *padapter, unsigned char *pbssrate, int *len);

void UpdateBrateTbl(struct adapter *padapter, u8 *mBratesOS);

void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen);

CRA Git | Maintained and supported by SUSTech CRA and CCSE