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

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

rtlwifi: rtl8821ae: Switch to use common rate control routine 



With this change, all of the drivers now use the common routine. As this
driver has VHT capability, an additional parameter is needed, thus all the
drivers had to be modified.

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

drivers/net/wireless/rtlwifi/base.c

+74 −2
Original line number Diff line number Diff line
@@ -881,12 +881,84 @@ static u8 _rtl_get_highest_n_rate(struct ieee80211_hw *hw, 
 * N rate:

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

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

 *

 * VHT rates:

 * DESC_RATEVHT1SS_MCS0-->DESC_RATEVHT1SS_MCS9 ==> idx is 0-->9

 * DESC_RATEVHT2SS_MCS0-->DESC_RATEVHT2SS_MCS9 ==> idx is 0-->9

 */

int rtlwifi_rate_mapping(struct ieee80211_hw *hw,

			 bool isht, u8 desc_rate)

int rtlwifi_rate_mapping(struct ieee80211_hw *hw, bool isht, bool isvht,

			 u8 desc_rate)

{

	int rate_idx;



	if (isvht) {

		switch (desc_rate) {

		case DESC_RATEVHT1SS_MCS0:

			rate_idx = 0;

			break;

		case DESC_RATEVHT1SS_MCS1:

			rate_idx = 1;

			break;

		case DESC_RATEVHT1SS_MCS2:

			rate_idx = 2;

			break;

		case DESC_RATEVHT1SS_MCS3:

			rate_idx = 3;

			break;

		case DESC_RATEVHT1SS_MCS4:

			rate_idx = 4;

			break;

		case DESC_RATEVHT1SS_MCS5:

			rate_idx = 5;

			break;

		case DESC_RATEVHT1SS_MCS6:

			rate_idx = 6;

			break;

		case DESC_RATEVHT1SS_MCS7:

			rate_idx = 7;

			break;

		case DESC_RATEVHT1SS_MCS8:

			rate_idx = 8;

			break;

		case DESC_RATEVHT1SS_MCS9:

			rate_idx = 9;

			break;

		case DESC_RATEVHT2SS_MCS0:

			rate_idx = 0;

			break;

		case DESC_RATEVHT2SS_MCS1:

			rate_idx = 1;

			break;

		case DESC_RATEVHT2SS_MCS2:

			rate_idx = 2;

			break;

		case DESC_RATEVHT2SS_MCS3:

			rate_idx = 3;

			break;

		case DESC_RATEVHT2SS_MCS4:

			rate_idx = 4;

			break;

		case DESC_RATEVHT2SS_MCS5:

			rate_idx = 5;

			break;

		case DESC_RATEVHT2SS_MCS6:

			rate_idx = 6;

			break;

		case DESC_RATEVHT2SS_MCS7:

			rate_idx = 7;

			break;

		case DESC_RATEVHT2SS_MCS8:

			rate_idx = 8;

			break;

		case DESC_RATEVHT2SS_MCS9:

			rate_idx = 9;

			break;

		default:

			rate_idx = 0;

			break;

		}

		return rate_idx;

	}

	if (false == isht) {

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

			switch (desc_rate) {

drivers/net/wireless/rtlwifi/base.h

+2 −2
Original line number Diff line number Diff line
@@ -123,8 +123,8 @@ void rtl_watch_dog_timer_callback(unsigned long data); 
void rtl_deinit_deferred_work(struct ieee80211_hw *hw);



bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx);

int rtlwifi_rate_mapping(struct ieee80211_hw *hw,

			 bool isht, u8 desc_rate);

int rtlwifi_rate_mapping(struct ieee80211_hw *hw, bool isht,

			 bool isvht, u8 desc_rate);

bool rtl_tx_mgmt_proc(struct ieee80211_hw *hw, struct sk_buff *skb);

u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx);

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

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw, 
	 * Notice: this is diff with windows define

	 */

	rx_status->rate_idx = rtlwifi_rate_mapping(hw, status->is_ht,

						   status->rate);

						   false, status->rate);



	rx_status->mactime = status->timestamp_low;

	if (phystatus == true) {

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

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw, 
	 * Notice: this is diff with windows define

	 */

	rx_status->rate_idx = rtlwifi_rate_mapping(hw, stats->is_ht,

						   stats->rate);

						   false, stats->rate);



	rx_status->mactime = stats->timestamp_low;

	if (phystatus) {

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

+2 −2
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ bool rtl92cu_rx_query_desc(struct ieee80211_hw *hw, 
	if (stats->decrypted)

		rx_status->flag |= RX_FLAG_DECRYPTED;

	rx_status->rate_idx = rtlwifi_rate_mapping(hw, stats->is_ht,

						   stats->rate);

						   false, stats->rate);

	rx_status->mactime = GET_RX_DESC_TSFL(pdesc);

	if (phystatus) {

		p_drvinfo = (struct rx_fwinfo_92c *)(skb->data +
@@ -407,7 +407,7 @@ static void _rtl_rx_process(struct ieee80211_hw *hw, struct sk_buff *skb) 
		rx_status->flag |= RX_FLAG_HT;

	/* Data rate */

	rx_status->rate_idx = rtlwifi_rate_mapping(hw, stats.is_ht,

						   stats.rate);

						   false, stats.rate);

	/*  There is a phy status after this rx descriptor. */

	if (GET_RX_DESC_PHY_STATUS(rxdesc)) {

		p_drvinfo = (struct rx_fwinfo_92c *)(rxdesc + RTL_RX_DESC_SIZE);