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

staging: rtl8723bs: simplify ratetbl_val_2wifirate() 



Simplify ratetbl_val_2wifirate() by not using extra variable
for the return value.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c9d19e68

drivers/staging/rtl8723bs/core/rtw_wlan_util.c

+14 −39
Original line number Diff line number Diff line
@@ -140,59 +140,34 @@ u8 networktype_to_raid_ex(struct adapter *adapter, struct sta_info *psta) 
unsigned char ratetbl_val_2wifirate(unsigned char rate);

unsigned char ratetbl_val_2wifirate(unsigned char rate)

{

	unsigned char val = 0;



	switch (rate & 0x7f) {

	case 0:

		val = IEEE80211_CCK_RATE_1MB;

		break;



		return IEEE80211_CCK_RATE_1MB;

	case 1:

		val = IEEE80211_CCK_RATE_2MB;

		break;



		return IEEE80211_CCK_RATE_2MB;

	case 2:

		val = IEEE80211_CCK_RATE_5MB;

		break;



		return IEEE80211_CCK_RATE_5MB;

	case 3:

		val = IEEE80211_CCK_RATE_11MB;

		break;



		return IEEE80211_CCK_RATE_11MB;

	case 4:

		val = IEEE80211_OFDM_RATE_6MB;

		break;



		return IEEE80211_OFDM_RATE_6MB;

	case 5:

		val = IEEE80211_OFDM_RATE_9MB;

		break;



		return IEEE80211_OFDM_RATE_9MB;

	case 6:

		val = IEEE80211_OFDM_RATE_12MB;

		break;



		return IEEE80211_OFDM_RATE_12MB;

	case 7:

		val = IEEE80211_OFDM_RATE_18MB;

		break;



		return IEEE80211_OFDM_RATE_18MB;

	case 8:

		val = IEEE80211_OFDM_RATE_24MB;

		break;



		return IEEE80211_OFDM_RATE_24MB;

	case 9:

		val = IEEE80211_OFDM_RATE_36MB;

		break;



		return IEEE80211_OFDM_RATE_36MB;

	case 10:

		val = IEEE80211_OFDM_RATE_48MB;

		break;



		return IEEE80211_OFDM_RATE_48MB;

	case 11:

		val = IEEE80211_OFDM_RATE_54MB;

		break;

		return IEEE80211_OFDM_RATE_54MB;

	default:

		return 0;

	}



	return val;

}



int is_basicrate(struct adapter *padapter, unsigned char rate);