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

staging: r8188eu: make two functions static 



The functions UpdateBrateTbl() and UpdateBrateTblForSoftAP() are only
used in rtw_mlme_ext.c. Make them static.

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220908130915.8406-4-straube.linux@gmail.com


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

drivers/staging/r8188eu/core/rtw_mlme_ext.c

+40 −0
Original line number Diff line number Diff line
@@ -931,6 +931,46 @@ unsigned int OnAuthClient(struct adapter *padapter, struct recv_frame *precv_fra 
	return _FAIL;

}



static void UpdateBrateTbl(u8 *mbrate)

{

	u8 i;

	u8 rate;



	/*  1M, 2M, 5.5M, 11M, 6M, 12M, 24M are mandatory. */

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

		rate = mbrate[i] & 0x7f;

		switch (rate) {

		case IEEE80211_CCK_RATE_1MB:

		case IEEE80211_CCK_RATE_2MB:

		case IEEE80211_CCK_RATE_5MB:

		case IEEE80211_CCK_RATE_11MB:

		case IEEE80211_OFDM_RATE_6MB:

		case IEEE80211_OFDM_RATE_12MB:

		case IEEE80211_OFDM_RATE_24MB:

			mbrate[i] |= IEEE80211_BASIC_RATE_MASK;

			break;

		}

	}

}



static void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen)

{

	u8 i;

	u8 rate;



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

		rate = bssrateset[i] & 0x7f;

		switch (rate) {

		case IEEE80211_CCK_RATE_1MB:

		case IEEE80211_CCK_RATE_2MB:

		case IEEE80211_CCK_RATE_5MB:

		case IEEE80211_CCK_RATE_11MB:

			bssrateset[i] |= IEEE80211_BASIC_RATE_MASK;

			break;

		}

	}

}



unsigned int OnAssocReq(struct adapter *padapter, struct recv_frame *precv_frame)

{

	u16 capab_info;

drivers/staging/r8188eu/core/rtw_wlan_util.c

+0 −40
Original line number Diff line number Diff line
@@ -222,46 +222,6 @@ void get_rate_set(struct adapter *padapter, unsigned char *pbssrate, int *bssrat 
	memcpy(pbssrate, supportedrates, *bssrate_len);

}



void UpdateBrateTbl(u8 *mbrate)

{

	u8	i;

	u8	rate;



	/*  1M, 2M, 5.5M, 11M, 6M, 12M, 24M are mandatory. */

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

		rate = mbrate[i] & 0x7f;

		switch (rate) {

		case IEEE80211_CCK_RATE_1MB:

		case IEEE80211_CCK_RATE_2MB:

		case IEEE80211_CCK_RATE_5MB:

		case IEEE80211_CCK_RATE_11MB:

		case IEEE80211_OFDM_RATE_6MB:

		case IEEE80211_OFDM_RATE_12MB:

		case IEEE80211_OFDM_RATE_24MB:

			mbrate[i] |= IEEE80211_BASIC_RATE_MASK;

			break;

		}

	}

}



void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen)

{

	u8	i;

	u8	rate;



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

		rate = bssrateset[i] & 0x7f;

		switch (rate) {

		case IEEE80211_CCK_RATE_1MB:

		case IEEE80211_CCK_RATE_2MB:

		case IEEE80211_CCK_RATE_5MB:

		case IEEE80211_CCK_RATE_11MB:

			bssrateset[i] |= IEEE80211_BASIC_RATE_MASK;

			break;

		}

	}

}



void Save_DM_Func_Flag(struct adapter *padapter)

{

	struct hal_data_8188e *haldata = &padapter->haldata;

drivers/staging/r8188eu/include/rtw_mlme_ext.h

+0 −2
Original line number Diff line number Diff line
@@ -393,8 +393,6 @@ extern 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);

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

void UpdateBrateTbl(u8 *mBratesOS);

void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen);



void Save_DM_Func_Flag(struct adapter *padapter);

void Restore_DM_Func_Flag(struct adapter *padapter);