Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0e776a3 authored by Larry Finger's avatar Larry Finger Committed by Kalle Valo
Browse files

rtlwifi: Convert all drivers to use a common set of rate descriptors 



This common set of rate descriptors is renamed to be DESC_RATExx.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 7b7d0d60

drivers/net/wireless/rtlwifi/base.c

+40 −40
Original line number Diff line number Diff line
@@ -867,20 +867,20 @@ static u8 _rtl_get_highest_n_rate(struct ieee80211_hw *hw, 
 *

 * B/G rate:

 * (rx_status->flag & RX_FLAG_HT) = 0,

 * DESC92_RATE1M-->DESC92_RATE54M ==> idx is 0-->11,

 * DESC_RATE1M-->DESC_RATE54M ==> idx is 0-->11,

 *

 * N rate:

 * (rx_status->flag & RX_FLAG_HT) = 1,

 * DESC92_RATEMCS0-->DESC92_RATEMCS15 ==> idx is 0-->15

 * DESC_RATEMCS0-->DESC_RATEMCS15 ==> idx is 0-->15

 *

 * 5G band:rx_status->band == IEEE80211_BAND_5GHZ

 * A rate:

 * (rx_status->flag & RX_FLAG_HT) = 0,

 * DESC92_RATE6M-->DESC92_RATE54M ==> idx is 0-->7,

 * DESC_RATE6M-->DESC_RATE54M ==> idx is 0-->7,

 *

 * N rate:

 * (rx_status->flag & RX_FLAG_HT) = 1,

 * DESC92_RATEMCS0-->DESC92_RATEMCS15 ==> idx is 0-->15

 * DESC_RATEMCS0-->DESC_RATEMCS15 ==> idx is 0-->15

 */

int rtlwifi_rate_mapping(struct ieee80211_hw *hw,

			 bool isht, u8 desc_rate)
@@ -890,40 +890,40 @@ int rtlwifi_rate_mapping(struct ieee80211_hw *hw, 
	if (false == isht) {

		if (IEEE80211_BAND_2GHZ == hw->conf.chandef.chan->band) {

			switch (desc_rate) {

			case DESC92_RATE1M:

			case DESC_RATE1M:

				rate_idx = 0;

				break;

			case DESC92_RATE2M:

			case DESC_RATE2M:

				rate_idx = 1;

				break;

			case DESC92_RATE5_5M:

			case DESC_RATE5_5M:

				rate_idx = 2;

				break;

			case DESC92_RATE11M:

			case DESC_RATE11M:

				rate_idx = 3;

				break;

			case DESC92_RATE6M:

			case DESC_RATE6M:

				rate_idx = 4;

				break;

			case DESC92_RATE9M:

			case DESC_RATE9M:

				rate_idx = 5;

				break;

			case DESC92_RATE12M:

			case DESC_RATE12M:

				rate_idx = 6;

				break;

			case DESC92_RATE18M:

			case DESC_RATE18M:

				rate_idx = 7;

				break;

			case DESC92_RATE24M:

			case DESC_RATE24M:

				rate_idx = 8;

				break;

			case DESC92_RATE36M:

			case DESC_RATE36M:

				rate_idx = 9;

				break;

			case DESC92_RATE48M:

			case DESC_RATE48M:

				rate_idx = 10;

				break;

			case DESC92_RATE54M:

			case DESC_RATE54M:

				rate_idx = 11;

				break;

			default:
@@ -932,28 +932,28 @@ int rtlwifi_rate_mapping(struct ieee80211_hw *hw, 
			}

		} else {

			switch (desc_rate) {

			case DESC92_RATE6M:

			case DESC_RATE6M:

				rate_idx = 0;

				break;

			case DESC92_RATE9M:

			case DESC_RATE9M:

				rate_idx = 1;

				break;

			case DESC92_RATE12M:

			case DESC_RATE12M:

				rate_idx = 2;

				break;

			case DESC92_RATE18M:

			case DESC_RATE18M:

				rate_idx = 3;

				break;

			case DESC92_RATE24M:

			case DESC_RATE24M:

				rate_idx = 4;

				break;

			case DESC92_RATE36M:

			case DESC_RATE36M:

				rate_idx = 5;

				break;

			case DESC92_RATE48M:

			case DESC_RATE48M:

				rate_idx = 6;

				break;

			case DESC92_RATE54M:

			case DESC_RATE54M:

				rate_idx = 7;

				break;

			default:
@@ -963,52 +963,52 @@ int rtlwifi_rate_mapping(struct ieee80211_hw *hw, 
		}

	} else {

		switch (desc_rate) {

		case DESC92_RATEMCS0:

		case DESC_RATEMCS0:

			rate_idx = 0;

			break;

		case DESC92_RATEMCS1:

		case DESC_RATEMCS1:

			rate_idx = 1;

			break;

		case DESC92_RATEMCS2:

		case DESC_RATEMCS2:

			rate_idx = 2;

			break;

		case DESC92_RATEMCS3:

		case DESC_RATEMCS3:

			rate_idx = 3;

			break;

		case DESC92_RATEMCS4:

		case DESC_RATEMCS4:

			rate_idx = 4;

			break;

		case DESC92_RATEMCS5:

		case DESC_RATEMCS5:

			rate_idx = 5;

			break;

		case DESC92_RATEMCS6:

		case DESC_RATEMCS6:

			rate_idx = 6;

			break;

		case DESC92_RATEMCS7:

		case DESC_RATEMCS7:

			rate_idx = 7;

			break;

		case DESC92_RATEMCS8:

		case DESC_RATEMCS8:

			rate_idx = 8;

			break;

		case DESC92_RATEMCS9:

		case DESC_RATEMCS9:

			rate_idx = 9;

			break;

		case DESC92_RATEMCS10:

		case DESC_RATEMCS10:

			rate_idx = 10;

			break;

		case DESC92_RATEMCS11:

		case DESC_RATEMCS11:

			rate_idx = 11;

			break;

		case DESC92_RATEMCS12:

		case DESC_RATEMCS12:

			rate_idx = 12;

			break;

		case DESC92_RATEMCS13:

		case DESC_RATEMCS13:

			rate_idx = 13;

			break;

		case DESC92_RATEMCS14:

		case DESC_RATEMCS14:

			rate_idx = 14;

			break;

		case DESC92_RATEMCS15:

		case DESC_RATEMCS15:

			rate_idx = 15;

			break;

		default:

drivers/net/wireless/rtlwifi/rtl8192ce/sw.c

+15 −15
Original line number Diff line number Diff line
@@ -334,21 +334,21 @@ static struct rtl_hal_cfg rtl92ce_hal_cfg = { 
	.maps[RTL_IMR_ROK] = IMR_ROK,

	.maps[RTL_IBSS_INT_MASKS] = (IMR_BCNINT | IMR_TBDOK | IMR_TBDER),



	.maps[RTL_RC_CCK_RATE1M] = DESC92_RATE1M,

	.maps[RTL_RC_CCK_RATE2M] = DESC92_RATE2M,

	.maps[RTL_RC_CCK_RATE5_5M] = DESC92_RATE5_5M,

	.maps[RTL_RC_CCK_RATE11M] = DESC92_RATE11M,

	.maps[RTL_RC_OFDM_RATE6M] = DESC92_RATE6M,

	.maps[RTL_RC_OFDM_RATE9M] = DESC92_RATE9M,

	.maps[RTL_RC_OFDM_RATE12M] = DESC92_RATE12M,

	.maps[RTL_RC_OFDM_RATE18M] = DESC92_RATE18M,

	.maps[RTL_RC_OFDM_RATE24M] = DESC92_RATE24M,

	.maps[RTL_RC_OFDM_RATE36M] = DESC92_RATE36M,

	.maps[RTL_RC_OFDM_RATE48M] = DESC92_RATE48M,

	.maps[RTL_RC_OFDM_RATE54M] = DESC92_RATE54M,



	.maps[RTL_RC_HT_RATEMCS7] = DESC92_RATEMCS7,

	.maps[RTL_RC_HT_RATEMCS15] = DESC92_RATEMCS15,

	.maps[RTL_RC_CCK_RATE1M] = DESC_RATE1M,

	.maps[RTL_RC_CCK_RATE2M] = DESC_RATE2M,

	.maps[RTL_RC_CCK_RATE5_5M] = DESC_RATE5_5M,

	.maps[RTL_RC_CCK_RATE11M] = DESC_RATE11M,

	.maps[RTL_RC_OFDM_RATE6M] = DESC_RATE6M,

	.maps[RTL_RC_OFDM_RATE9M] = DESC_RATE9M,

	.maps[RTL_RC_OFDM_RATE12M] = DESC_RATE12M,

	.maps[RTL_RC_OFDM_RATE18M] = DESC_RATE18M,

	.maps[RTL_RC_OFDM_RATE24M] = DESC_RATE24M,

	.maps[RTL_RC_OFDM_RATE36M] = DESC_RATE36M,

	.maps[RTL_RC_OFDM_RATE48M] = DESC_RATE48M,

	.maps[RTL_RC_OFDM_RATE54M] = DESC_RATE54M,



	.maps[RTL_RC_HT_RATEMCS7] = DESC_RATEMCS7,

	.maps[RTL_RC_HT_RATEMCS15] = DESC_RATEMCS15,

};



static const struct pci_device_id rtl92ce_pci_ids[] = {

drivers/net/wireless/rtlwifi/rtl8192ce/trx.c

+4 −4
Original line number Diff line number Diff line
@@ -257,8 +257,8 @@ static void _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw, 
		pstats->recvsignalpower = rx_pwr_all;



		/* (3)EVM of HT rate */

		if (pstats->is_ht && pstats->rate >= DESC92_RATEMCS8 &&

		    pstats->rate <= DESC92_RATEMCS15)

		if (pstats->is_ht && pstats->rate >= DESC_RATEMCS8 &&

		    pstats->rate <= DESC_RATEMCS15)

			max_spatial_stream = 2;

		else

			max_spatial_stream = 1;
@@ -500,7 +500,7 @@ void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw, 
		SET_TX_DESC_RTS_BW(pdesc, 0);

		SET_TX_DESC_RTS_SC(pdesc, tcb_desc->rts_sc);

		SET_TX_DESC_RTS_SHORT(pdesc,

				      ((tcb_desc->rts_rate <= DESC92_RATE54M) ?

				      ((tcb_desc->rts_rate <= DESC_RATE54M) ?

				       (tcb_desc->rts_use_shortpreamble ? 1 : 0)

				       : (tcb_desc->rts_use_shortgi ? 1 : 0)));
@@ -623,7 +623,7 @@ void rtl92ce_tx_fill_cmddesc(struct ieee80211_hw *hw, 
	if (firstseg)

		SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN);



	SET_TX_DESC_TX_RATE(pdesc, DESC92_RATE1M);

	SET_TX_DESC_TX_RATE(pdesc, DESC_RATE1M);



	SET_TX_DESC_SEQ(pdesc, 0);

drivers/net/wireless/rtlwifi/rtl8192cu/mac.c

+2 −2
Original line number Diff line number Diff line
@@ -880,8 +880,8 @@ static void _rtl92c_query_rxphystatus(struct ieee80211_hw *hw, 
		pstats->rxpower = rx_pwr_all;

		pstats->recvsignalpower = rx_pwr_all;

		if (GET_RX_DESC_RX_MCS(pdesc) &&

		    GET_RX_DESC_RX_MCS(pdesc) >= DESC92_RATEMCS8 &&

		    GET_RX_DESC_RX_MCS(pdesc) <= DESC92_RATEMCS15)

		    GET_RX_DESC_RX_MCS(pdesc) >= DESC_RATEMCS8 &&

		    GET_RX_DESC_RX_MCS(pdesc) <= DESC_RATEMCS15)

			max_spatial_stream = 2;

		else

			max_spatial_stream = 1;

drivers/net/wireless/rtlwifi/rtl8192cu/sw.c

+14 −14
Original line number Diff line number Diff line
@@ -257,20 +257,20 @@ static struct rtl_hal_cfg rtl92cu_hal_cfg = { 
	.maps[RTL_IMR_ROK] = IMR_ROK,

	.maps[RTL_IBSS_INT_MASKS] = (IMR_BCNINT | IMR_TBDOK | IMR_TBDER),



	.maps[RTL_RC_CCK_RATE1M] = DESC92_RATE1M,

	.maps[RTL_RC_CCK_RATE2M] = DESC92_RATE2M,

	.maps[RTL_RC_CCK_RATE5_5M] = DESC92_RATE5_5M,

	.maps[RTL_RC_CCK_RATE11M] = DESC92_RATE11M,

	.maps[RTL_RC_OFDM_RATE6M] = DESC92_RATE6M,

	.maps[RTL_RC_OFDM_RATE9M] = DESC92_RATE9M,

	.maps[RTL_RC_OFDM_RATE12M] = DESC92_RATE12M,

	.maps[RTL_RC_OFDM_RATE18M] = DESC92_RATE18M,

	.maps[RTL_RC_OFDM_RATE24M] = DESC92_RATE24M,

	.maps[RTL_RC_OFDM_RATE36M] = DESC92_RATE36M,

	.maps[RTL_RC_OFDM_RATE48M] = DESC92_RATE48M,

	.maps[RTL_RC_OFDM_RATE54M] = DESC92_RATE54M,

	.maps[RTL_RC_HT_RATEMCS7] = DESC92_RATEMCS7,

	.maps[RTL_RC_HT_RATEMCS15] = DESC92_RATEMCS15,

	.maps[RTL_RC_CCK_RATE1M] = DESC_RATE1M,

	.maps[RTL_RC_CCK_RATE2M] = DESC_RATE2M,

	.maps[RTL_RC_CCK_RATE5_5M] = DESC_RATE5_5M,

	.maps[RTL_RC_CCK_RATE11M] = DESC_RATE11M,

	.maps[RTL_RC_OFDM_RATE6M] = DESC_RATE6M,

	.maps[RTL_RC_OFDM_RATE9M] = DESC_RATE9M,

	.maps[RTL_RC_OFDM_RATE12M] = DESC_RATE12M,

	.maps[RTL_RC_OFDM_RATE18M] = DESC_RATE18M,

	.maps[RTL_RC_OFDM_RATE24M] = DESC_RATE24M,

	.maps[RTL_RC_OFDM_RATE36M] = DESC_RATE36M,

	.maps[RTL_RC_OFDM_RATE48M] = DESC_RATE48M,

	.maps[RTL_RC_OFDM_RATE54M] = DESC_RATE54M,

	.maps[RTL_RC_HT_RATEMCS7] = DESC_RATEMCS7,

	.maps[RTL_RC_HT_RATEMCS15] = DESC_RATEMCS15,

};



#define USB_VENDER_ID_REALTEK		0x0bda