rtlwifi: Install updated rate-mapping routine

In preparation for fixing the rate-mapping situation, place a driver-agnostic version in rtlwifi. This one contains the updated rate incormation. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Cc: Chaoming Li <chaoming_li@realsil.com.cn> Signed-off-by: John W. Linville <linville@tuxdriver.com>
author: Larry Finger <Larry.Finger@lwfinger.net> 2011-08-22 17:50:14 -0400
committer: John W. Linville <linville@tuxdriver.com> 2011-08-24 14:57:18 -0400
commit: 7ad0ce3576edb2ea65bd5c93a83c4a6afaa1dd76 (patch)
tree: f5b0342d0446524d76437b938385c1ae93c1e5a3 /drivers/net/wireless/rtlwifi/base.c
parent: f750323009b6540cc614304fd784300b49506797 (diff)
1 files changed, 161 insertions, 0 deletions
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index 0b598db38da9..098fc557a88d 100644
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@ -664,6 +664,167 @@ static u8 _rtl_get_highest_n_rate(struct ieee80211_hw *hw)
        return hw_rate;
 }
+/* mac80211's rate_idx is like this:
+ *
+ * 2.4G band:rx_status->band == IEEE80211_BAND_2GHZ
+ *
+ * B/G rate:
+ * (rx_status->flag & RX_FLAG_HT) = 0,
+ * DESC92_RATE1M-->DESC92_RATE54M ==> idx is 0-->11,
+ *
+ * N rate:
+ * (rx_status->flag & RX_FLAG_HT) = 1,
+ * DESC92_RATEMCS0-->DESC92_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,
+ *
+ * N rate:
+ * (rx_status->flag & RX_FLAG_HT) = 1,
+ * DESC92_RATEMCS0-->DESC92_RATEMCS15 ==> idx is 0-->15
+ */
+int rtlwifi_rate_mapping(struct ieee80211_hw *hw,
+                         bool isht, u8 desc_rate, bool first_ampdu)
+{
+        int rate_idx;
+        if (false == isht) {
+                if (IEEE80211_BAND_2GHZ == hw->conf.channel->band) {
+                        switch (desc_rate) {
+                        case DESC92_RATE1M:
+                                rate_idx = 0;
+                                break;
+                        case DESC92_RATE2M:
+                                rate_idx = 1;
+                                break;
+                        case DESC92_RATE5_5M:
+                                rate_idx = 2;
+                                break;
+                        case DESC92_RATE11M:
+                                rate_idx = 3;
+                                break;
+                        case DESC92_RATE6M:
+                                rate_idx = 4;
+                                break;
+                        case DESC92_RATE9M:
+                                rate_idx = 5;
+                                break;
+                        case DESC92_RATE12M:
+                                rate_idx = 6;
+                                break;
+                        case DESC92_RATE18M:
+                                rate_idx = 7;
+                                break;
+                        case DESC92_RATE24M:
+                                rate_idx = 8;
+                                break;
+                        case DESC92_RATE36M:
+                                rate_idx = 9;
+                                break;
+                        case DESC92_RATE48M:
+                                rate_idx = 10;
+                                break;
+                        case DESC92_RATE54M:
+                                rate_idx = 11;
+                                break;
+                        default:
+                                rate_idx = 0;
+                                break;
+                        }
+                } else {
+                        switch (desc_rate) {
+                        case DESC92_RATE6M:
+                                rate_idx = 0;
+                                break;
+                        case DESC92_RATE9M:
+                                rate_idx = 1;
+                                break;
+                        case DESC92_RATE12M:
+                                rate_idx = 2;
+                                break;
+                        case DESC92_RATE18M:
+                                rate_idx = 3;
+                                break;
+                        case DESC92_RATE24M:
+                                rate_idx = 4;
+                                break;
+                        case DESC92_RATE36M:
+                                rate_idx = 5;
+                                break;
+                        case DESC92_RATE48M:
+                                rate_idx = 6;
+                                break;
+                        case DESC92_RATE54M:
+                                rate_idx = 7;
+                                break;
+                        default:
+                                rate_idx = 0;
+                                break;
+                        }
+                }
+        } else {
+                switch (desc_rate) {
+                case DESC92_RATEMCS0:
+                        rate_idx = 0;
+                        break;
+                case DESC92_RATEMCS1:
+                        rate_idx = 1;
+                        break;
+                case DESC92_RATEMCS2:
+                        rate_idx = 2;
+                        break;
+                case DESC92_RATEMCS3:
+                        rate_idx = 3;
+                        break;
+                case DESC92_RATEMCS4:
+                        rate_idx = 4;
+                        break;
+                case DESC92_RATEMCS5:
+                        rate_idx = 5;
+                        break;
+                case DESC92_RATEMCS6:
+                        rate_idx = 6;
+                        break;
+                case DESC92_RATEMCS7:
+                        rate_idx = 7;
+                        break;
+                case DESC92_RATEMCS8:
+                        rate_idx = 8;
+                        break;
+                case DESC92_RATEMCS9:
+                        rate_idx = 9;
+                        break;
+                case DESC92_RATEMCS10:
+                        rate_idx = 10;
+                        break;
+                case DESC92_RATEMCS11:
+                        rate_idx = 11;
+                        break;
+                case DESC92_RATEMCS12:
+                        rate_idx = 12;
+                        break;
+                case DESC92_RATEMCS13:
+                        rate_idx = 13;
+                        break;
+                case DESC92_RATEMCS14:
+                        rate_idx = 14;
+                        break;
+                case DESC92_RATEMCS15:
+                        rate_idx = 15;
+                        break;
+                default:
+                        rate_idx = 0;
+                        break;
+                }
+        }
+        return rate_idx;
+}
+EXPORT_SYMBOL(rtlwifi_rate_mapping);
 void rtl_get_tcb_desc(struct ieee80211_hw *hw,
                      struct ieee80211_tx_info *info,
                      struct ieee80211_sta *sta,
author	Larry Finger <Larry.Finger@lwfinger.net>	2011-08-22 17:50:14 -0400
committer	John W. Linville <linville@tuxdriver.com>	2011-08-24 14:57:18 -0400
commit	7ad0ce3576edb2ea65bd5c93a83c4a6afaa1dd76 (patch)
tree	f5b0342d0446524d76437b938385c1ae93c1e5a3 /drivers/net/wireless/rtlwifi/base.c
parent	f750323009b6540cc614304fd784300b49506797 (diff)

diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c index 0b598db38da9..098fc557a88d 100644 --- a/drivers/net/wireless/rtlwifi/base.c +++ b/drivers/net/wireless/rtlwifi/base.c
@@ -664,6 +664,167 @@ static u8 _rtl_get_highest_n_rate(struct ieee80211_hw *hw)
664	return hw_rate;	664	return hw_rate;
665	}	665	}
666		666
		667	/* mac80211's rate_idx is like this:
		668	*
		669	* 2.4G band:rx_status->band == IEEE80211_BAND_2GHZ
		670	*
		671	* B/G rate:
		672	* (rx_status->flag & RX_FLAG_HT) = 0,
		673	* DESC92_RATE1M-->DESC92_RATE54M ==> idx is 0-->11,
		674	*
		675	* N rate:
		676	* (rx_status->flag & RX_FLAG_HT) = 1,
		677	* DESC92_RATEMCS0-->DESC92_RATEMCS15 ==> idx is 0-->15
		678	*
		679	* 5G band:rx_status->band == IEEE80211_BAND_5GHZ
		680	* A rate:
		681	* (rx_status->flag & RX_FLAG_HT) = 0,
		682	* DESC92_RATE6M-->DESC92_RATE54M ==> idx is 0-->7,
		683	*
		684	* N rate:
		685	* (rx_status->flag & RX_FLAG_HT) = 1,
		686	* DESC92_RATEMCS0-->DESC92_RATEMCS15 ==> idx is 0-->15
		687	*/
		688	int rtlwifi_rate_mapping(struct ieee80211_hw *hw,
		689	bool isht, u8 desc_rate, bool first_ampdu)
		690	{
		691	int rate_idx;
		692
		693	if (false == isht) {
		694	if (IEEE80211_BAND_2GHZ == hw->conf.channel->band) {
		695	switch (desc_rate) {
		696	case DESC92_RATE1M:
		697	rate_idx = 0;
		698	break;
		699	case DESC92_RATE2M:
		700	rate_idx = 1;
		701	break;
		702	case DESC92_RATE5_5M:
		703	rate_idx = 2;
		704	break;
		705	case DESC92_RATE11M:
		706	rate_idx = 3;
		707	break;
		708	case DESC92_RATE6M:
		709	rate_idx = 4;
		710	break;
		711	case DESC92_RATE9M:
		712	rate_idx = 5;
		713	break;
		714	case DESC92_RATE12M:
		715	rate_idx = 6;
		716	break;
		717	case DESC92_RATE18M:
		718	rate_idx = 7;
		719	break;
		720	case DESC92_RATE24M:
		721	rate_idx = 8;
		722	break;
		723	case DESC92_RATE36M:
		724	rate_idx = 9;
		725	break;
		726	case DESC92_RATE48M:
		727	rate_idx = 10;
		728	break;
		729	case DESC92_RATE54M:
		730	rate_idx = 11;
		731	break;
		732	default:
		733	rate_idx = 0;
		734	break;
		735	}
		736	} else {
		737	switch (desc_rate) {
		738	case DESC92_RATE6M:
		739	rate_idx = 0;
		740	break;
		741	case DESC92_RATE9M:
		742	rate_idx = 1;
		743	break;
		744	case DESC92_RATE12M:
		745	rate_idx = 2;
		746	break;
		747	case DESC92_RATE18M:
		748	rate_idx = 3;
		749	break;
		750	case DESC92_RATE24M:
		751	rate_idx = 4;
		752	break;
		753	case DESC92_RATE36M:
		754	rate_idx = 5;
		755	break;
		756	case DESC92_RATE48M:
		757	rate_idx = 6;
		758	break;
		759	case DESC92_RATE54M:
		760	rate_idx = 7;
		761	break;
		762	default:
		763	rate_idx = 0;
		764	break;
		765	}
		766	}
		767
		768	} else {
		769
		770	switch (desc_rate) {
		771	case DESC92_RATEMCS0:
		772	rate_idx = 0;
		773	break;
		774	case DESC92_RATEMCS1:
		775	rate_idx = 1;
		776	break;
		777	case DESC92_RATEMCS2:
		778	rate_idx = 2;
		779	break;
		780	case DESC92_RATEMCS3:
		781	rate_idx = 3;
		782	break;
		783	case DESC92_RATEMCS4:
		784	rate_idx = 4;
		785	break;
		786	case DESC92_RATEMCS5:
		787	rate_idx = 5;
		788	break;
		789	case DESC92_RATEMCS6:
		790	rate_idx = 6;
		791	break;
		792	case DESC92_RATEMCS7:
		793	rate_idx = 7;
		794	break;
		795	case DESC92_RATEMCS8:
		796	rate_idx = 8;
		797	break;
		798	case DESC92_RATEMCS9:
		799	rate_idx = 9;
		800	break;
		801	case DESC92_RATEMCS10:
		802	rate_idx = 10;
		803	break;
		804	case DESC92_RATEMCS11:
		805	rate_idx = 11;
		806	break;
		807	case DESC92_RATEMCS12:
		808	rate_idx = 12;
		809	break;
		810	case DESC92_RATEMCS13:
		811	rate_idx = 13;
		812	break;
		813	case DESC92_RATEMCS14:
		814	rate_idx = 14;
		815	break;
		816	case DESC92_RATEMCS15:
		817	rate_idx = 15;
		818	break;
		819	default:
		820	rate_idx = 0;
		821	break;
		822	}
		823	}
		824	return rate_idx;
		825	}
		826	EXPORT_SYMBOL(rtlwifi_rate_mapping);
		827
667	void rtl_get_tcb_desc(struct ieee80211_hw *hw,	828	void rtl_get_tcb_desc(struct ieee80211_hw *hw,
668	struct ieee80211_tx_info *info,	829	struct ieee80211_tx_info *info,
669	struct ieee80211_sta *sta,	830	struct ieee80211_sta *sta,