Skip to content

R
raspberrypi-kernel

openeuler / raspberrypi-kernel

通知 13
Star 1
Fork 0
R
raspberrypi-kernel
提交 23d99394 编写于 作者: S Sujith Manoharan 提交者： John W. Linville
浏览文件
操作

ath9k: Trim rate table 

Remove ctrl_rate, cw40index, sgi_index, ht_index and calculate
the rate index for TX status from the valid_rate_index that
is populated at initialization time.
Signed-off-by: NSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 f8a87017
隐藏空白更改
内联 并排
Showing with 174 addition and 180 deletion
drivers/net/wireless/ath/ath9k/rc.c
浏览文件 @ 23d99394
...@@ -25,141 +25,141 @@ static const struct ath_rate_table ar5416_11na_ratetable = { ...@@ -25,141 +25,141 @@ static const struct ath_rate_table ar5416_11na_ratetable = {
8, /* MCS start */ 8, /* MCS start */
{ {
[0] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 6000, [0] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 6000,
5400, 0, 12, 0, 0, 0, 0 }, /* 6 Mb */ 5400, 0, 12 }, /* 6 Mb */
[1] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 9000, [1] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 9000,
7800, 1, 18, 0, 1, 1, 1 }, /* 9 Mb */ 7800, 1, 18 }, /* 9 Mb */
[2] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 12000, [2] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 12000,
10000, 2, 24, 2, 2, 2, 2 }, /* 12 Mb */ 10000, 2, 24 }, /* 12 Mb */
[3] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 18000, [3] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 18000,
13900, 3, 36, 2, 3, 3, 3 }, /* 18 Mb */ 13900, 3, 36 }, /* 18 Mb */
[4] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 24000, [4] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 24000,
17300, 4, 48, 4, 4, 4, 4 }, /* 24 Mb */ 17300, 4, 48 }, /* 24 Mb */
[5] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 36000, [5] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 36000,
23000, 5, 72, 4, 5, 5, 5 }, /* 36 Mb */ 23000, 5, 72 }, /* 36 Mb */
[6] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 48000, [6] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 48000,
27400, 6, 96, 4, 6, 6, 6 }, /* 48 Mb */ 27400, 6, 96 }, /* 48 Mb */
[7] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 54000, [7] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 54000,
29300, 7, 108, 4, 7, 7, 7 }, /* 54 Mb */ 29300, 7, 108 }, /* 54 Mb */
[8] = { RC_HT_SDT_2040, WLAN_RC_PHY_HT_20_SS, 6500, [8] = { RC_HT_SDT_2040, WLAN_RC_PHY_HT_20_SS, 6500,
6400, 0, 0, 0, 38, 8, 38 }, /* 6.5 Mb */ 6400, 0, 0 }, /* 6.5 Mb */
[9] = { RC_HT_SDT_20, WLAN_RC_PHY_HT_20_SS, 13000, [9] = { RC_HT_SDT_20, WLAN_RC_PHY_HT_20_SS, 13000,
12700, 1, 1, 2, 39, 9, 39 }, /* 13 Mb */ 12700, 1, 1 }, /* 13 Mb */
[10] = { RC_HT_SDT_20, WLAN_RC_PHY_HT_20_SS, 19500, [10] = { RC_HT_SDT_20, WLAN_RC_PHY_HT_20_SS, 19500,
18800, 2, 2, 2, 40, 10, 40 }, /* 19.5 Mb */ 18800, 2, 2 }, /* 19.5 Mb */
[11] = { RC_HT_SD_20, WLAN_RC_PHY_HT_20_SS, 26000, [11] = { RC_HT_SD_20, WLAN_RC_PHY_HT_20_SS, 26000,
25000, 3, 3, 4, 41, 11, 41 }, /* 26 Mb */ 25000, 3, 3 }, /* 26 Mb */
[12] = { RC_HT_SD_20, WLAN_RC_PHY_HT_20_SS, 39000, [12] = { RC_HT_SD_20, WLAN_RC_PHY_HT_20_SS, 39000,
36700, 4, 4, 4, 42, 12, 42 }, /* 39 Mb */ 36700, 4, 4 }, /* 39 Mb */
[13] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 52000, [13] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 52000,
48100, 5, 5, 4, 43, 13, 43 }, /* 52 Mb */ 48100, 5, 5 }, /* 52 Mb */
[14] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 58500, [14] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 58500,
53500, 6, 6, 4, 44, 14, 44 }, /* 58.5 Mb */ 53500, 6, 6 }, /* 58.5 Mb */
[15] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 65000, [15] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 65000,
59000, 7, 7, 4, 45, 16, 46 }, /* 65 Mb */ 59000, 7, 7 }, /* 65 Mb */
[16] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS_HGI, 72200, [16] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS_HGI, 72200,
65400, 7, 7, 4, 45, 16, 46 }, /* 75 Mb */ 65400, 7, 7 }, /* 75 Mb */
[17] = { RC_INVALID, WLAN_RC_PHY_HT_20_DS, 13000, [17] = { RC_INVALID, WLAN_RC_PHY_HT_20_DS, 13000,
12700, 8, 8, 0, 47, 17, 47 }, /* 13 Mb */ 12700, 8, 8 }, /* 13 Mb */
[18] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_DS, 26000, [18] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_DS, 26000,
24800, 9, 9, 2, 48, 18, 48 }, /* 26 Mb */ 24800, 9, 9 }, /* 26 Mb */
[19] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_DS, 39000, [19] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_DS, 39000,
36600, 10, 10, 2, 49, 19, 49 }, /* 39 Mb */ 36600, 10, 10 }, /* 39 Mb */
[20] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 52000, [20] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 52000,
48100, 11, 11, 4, 50, 20, 50 }, /* 52 Mb */ 48100, 11, 11 }, /* 52 Mb */
[21] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 78000, [21] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 78000,
69500, 12, 12, 4, 51, 21, 51 }, /* 78 Mb */ 69500, 12, 12 }, /* 78 Mb */
[22] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 104000, [22] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 104000,
89500, 13, 13, 4, 52, 22, 52 }, /* 104 Mb */ 89500, 13, 13 }, /* 104 Mb */
[23] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 117000, [23] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 117000,
98900, 14, 14, 4, 53, 23, 53 }, /* 117 Mb */ 98900, 14, 14 }, /* 117 Mb */
[24] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 130000, [24] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 130000,
108300, 15, 15, 4, 54, 25, 55 }, /* 130 Mb */ 108300, 15, 15 }, /* 130 Mb */
[25] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS_HGI, 144400, [25] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS_HGI, 144400,
120000, 15, 15, 4, 54, 25, 55 }, /* 144.4 Mb */ 120000, 15, 15 }, /* 144.4 Mb */
[26] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 19500, [26] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 19500,
17400, 16, 16, 0, 56, 26, 56 }, /* 19.5 Mb */ 17400, 16, 16 }, /* 19.5 Mb */
[27] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 39000, [27] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 39000,
35100, 17, 17, 2, 57, 27, 57 }, /* 39 Mb */ 35100, 17, 17 }, /* 39 Mb */
[28] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 58500, [28] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 58500,
52600, 18, 18, 2, 58, 28, 58 }, /* 58.5 Mb */ 52600, 18, 18 }, /* 58.5 Mb */
[29] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 78000, [29] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 78000,
70400, 19, 19, 4, 59, 29, 59 }, /* 78 Mb */ 70400, 19, 19 }, /* 78 Mb */
[30] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 117000, [30] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 117000,
104900, 20, 20, 4, 60, 31, 61 }, /* 117 Mb */ 104900, 20, 20 }, /* 117 Mb */
[31] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS_HGI, 130000, [31] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS_HGI, 130000,
115800, 20, 20, 4, 60, 31, 61 }, /* 130 Mb*/ 115800, 20, 20 }, /* 130 Mb*/
[32] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 156000, [32] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 156000,
137200, 21, 21, 4, 62, 33, 63 }, /* 156 Mb */ 137200, 21, 21 }, /* 156 Mb */
[33] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 173300, [33] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 173300,
151100, 21, 21, 4, 62, 33, 63 }, /* 173.3 Mb */ 151100, 21, 21 }, /* 173.3 Mb */
[34] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 175500, [34] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 175500,
152800, 22, 22, 4, 64, 35, 65 }, /* 175.5 Mb */ 152800, 22, 22 }, /* 175.5 Mb */
[35] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 195000, [35] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 195000,
168400, 22, 22, 4, 64, 35, 65 }, /* 195 Mb*/ 168400, 22, 22 }, /* 195 Mb*/
[36] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 195000, [36] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 195000,
168400, 23, 23, 4, 66, 37, 67 }, /* 195 Mb */ 168400, 23, 23 }, /* 195 Mb */
[37] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 216700, [37] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 216700,
185000, 23, 23, 4, 66, 37, 67 }, /* 216.7 Mb */ 185000, 23, 23 }, /* 216.7 Mb */
[38] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 13500, [38] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 13500,
13200, 0, 0, 0, 38, 38, 38 }, /* 13.5 Mb*/ 13200, 0, 0 }, /* 13.5 Mb*/
[39] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 27500, [39] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 27500,
25900, 1, 1, 2, 39, 39, 39 }, /* 27.0 Mb*/ 25900, 1, 1 }, /* 27.0 Mb*/
[40] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 40500, [40] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 40500,
38600, 2, 2, 2, 40, 40, 40 }, /* 40.5 Mb*/ 38600, 2, 2 }, /* 40.5 Mb*/
[41] = { RC_HT_SD_40, WLAN_RC_PHY_HT_40_SS, 54000, [41] = { RC_HT_SD_40, WLAN_RC_PHY_HT_40_SS, 54000,
49800, 3, 3, 4, 41, 41, 41 }, /* 54 Mb */ 49800, 3, 3 }, /* 54 Mb */
[42] = { RC_HT_SD_40, WLAN_RC_PHY_HT_40_SS, 81500, [42] = { RC_HT_SD_40, WLAN_RC_PHY_HT_40_SS, 81500,
72200, 4, 4, 4, 42, 42, 42 }, /* 81 Mb */ 72200, 4, 4 }, /* 81 Mb */
[43] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 108000, [43] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 108000,
92900, 5, 5, 4, 43, 43, 43 }, /* 108 Mb */ 92900, 5, 5 }, /* 108 Mb */
[44] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 121500, [44] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 121500,
102700, 6, 6, 4, 44, 44, 44 }, /* 121.5 Mb*/ 102700, 6, 6 }, /* 121.5 Mb*/
[45] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 135000, [45] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 135000,
112000, 7, 7, 4, 45, 46, 46 }, /* 135 Mb */ 112000, 7, 7 }, /* 135 Mb */
[46] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS_HGI, 150000, [46] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS_HGI, 150000,
122000, 7, 7, 4, 45, 46, 46 }, /* 150 Mb */ 122000, 7, 7 }, /* 150 Mb */
[47] = { RC_INVALID, WLAN_RC_PHY_HT_40_DS, 27000, [47] = { RC_INVALID, WLAN_RC_PHY_HT_40_DS, 27000,
25800, 8, 8, 0, 47, 47, 47 }, /* 27 Mb */ 25800, 8, 8 }, /* 27 Mb */
[48] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_DS, 54000, [48] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_DS, 54000,
49800, 9, 9, 2, 48, 48, 48 }, /* 54 Mb */ 49800, 9, 9 }, /* 54 Mb */
[49] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_DS, 81000, [49] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_DS, 81000,
71900, 10, 10, 2, 49, 49, 49 }, /* 81 Mb */ 71900, 10, 10 }, /* 81 Mb */
[50] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 108000, [50] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 108000,
92500, 11, 11, 4, 50, 50, 50 }, /* 108 Mb */ 92500, 11, 11 }, /* 108 Mb */
[51] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 162000, [51] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 162000,
130300, 12, 12, 4, 51, 51, 51 }, /* 162 Mb */ 130300, 12, 12 }, /* 162 Mb */
[52] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 216000, [52] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 216000,
162800, 13, 13, 4, 52, 52, 52 }, /* 216 Mb */ 162800, 13, 13 }, /* 216 Mb */
[53] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 243000, [53] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 243000,
178200, 14, 14, 4, 53, 53, 53 }, /* 243 Mb */ 178200, 14, 14 }, /* 243 Mb */
[54] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 270000, [54] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 270000,
192100, 15, 15, 4, 54, 55, 55 }, /* 270 Mb */ 192100, 15, 15 }, /* 270 Mb */
[55] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS_HGI, 300000, [55] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS_HGI, 300000,
207000, 15, 15, 4, 54, 55, 55 }, /* 300 Mb */ 207000, 15, 15 }, /* 300 Mb */
[56] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 40500, [56] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 40500,
36100, 16, 16, 0, 56, 56, 56 }, /* 40.5 Mb */ 36100, 16, 16 }, /* 40.5 Mb */
[57] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 81000, [57] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 81000,
72900, 17, 17, 2, 57, 57, 57 }, /* 81 Mb */ 72900, 17, 17 }, /* 81 Mb */
[58] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 121500, [58] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 121500,
108300, 18, 18, 2, 58, 58, 58 }, /* 121.5 Mb */ 108300, 18, 18 }, /* 121.5 Mb */
[59] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 162000, [59] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 162000,
142000, 19, 19, 4, 59, 59, 59 }, /* 162 Mb */ 142000, 19, 19 }, /* 162 Mb */
[60] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 243000, [60] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 243000,
205100, 20, 20, 4, 60, 61, 61 }, /* 243 Mb */ 205100, 20, 20 }, /* 243 Mb */
[61] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS_HGI, 270000, [61] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS_HGI, 270000,
224700, 20, 20, 4, 60, 61, 61 }, /* 270 Mb */ 224700, 20, 20 }, /* 270 Mb */
[62] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 324000, [62] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 324000,
263100, 21, 21, 4, 62, 63, 63 }, /* 324 Mb */ 263100, 21, 21 }, /* 324 Mb */
[63] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 360000, [63] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 360000,
288000, 21, 21, 4, 62, 63, 63 }, /* 360 Mb */ 288000, 21, 21 }, /* 360 Mb */
[64] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 364500, [64] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 364500,
290700, 22, 22, 4, 64, 65, 65 }, /* 364.5 Mb */ 290700, 22, 22 }, /* 364.5 Mb */
[65] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 405000, [65] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 405000,
317200, 22, 22, 4, 64, 65, 65 }, /* 405 Mb */ 317200, 22, 22 }, /* 405 Mb */
[66] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 405000, [66] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 405000,
317200, 23, 23, 4, 66, 67, 67 }, /* 405 Mb */ 317200, 23, 23 }, /* 405 Mb */
[67] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 450000, [67] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 450000,
346400, 23, 23, 4, 66, 67, 67 }, /* 450 Mb */ 346400, 23, 23 }, /* 450 Mb */
}, },
50, /* probe interval */ 50, /* probe interval */
WLAN_RC_HT_FLAG, /* Phy rates allowed initially */ WLAN_RC_HT_FLAG, /* Phy rates allowed initially */
...@@ -173,149 +173,149 @@ static const struct ath_rate_table ar5416_11ng_ratetable = { ...@@ -173,149 +173,149 @@ static const struct ath_rate_table ar5416_11ng_ratetable = {
12, /* MCS start */ 12, /* MCS start */
{ {
[0] = { RC_ALL, WLAN_RC_PHY_CCK, 1000, [0] = { RC_ALL, WLAN_RC_PHY_CCK, 1000,
900, 0, 2, 0, 0, 0, 0 }, /* 1 Mb */ 900, 0, 2 }, /* 1 Mb */
[1] = { RC_ALL, WLAN_RC_PHY_CCK, 2000, [1] = { RC_ALL, WLAN_RC_PHY_CCK, 2000,
1900, 1, 4, 1, 1, 1, 1 }, /* 2 Mb */ 1900, 1, 4 }, /* 2 Mb */
[2] = { RC_ALL, WLAN_RC_PHY_CCK, 5500, [2] = { RC_ALL, WLAN_RC_PHY_CCK, 5500,
4900, 2, 11, 2, 2, 2, 2 }, /* 5.5 Mb */ 4900, 2, 11 }, /* 5.5 Mb */
[3] = { RC_ALL, WLAN_RC_PHY_CCK, 11000, [3] = { RC_ALL, WLAN_RC_PHY_CCK, 11000,
8100, 3, 22, 3, 3, 3, 3 }, /* 11 Mb */ 8100, 3, 22 }, /* 11 Mb */
[4] = { RC_INVALID, WLAN_RC_PHY_OFDM, 6000, [4] = { RC_INVALID, WLAN_RC_PHY_OFDM, 6000,
5400, 4, 12, 4, 4, 4, 4 }, /* 6 Mb */ 5400, 4, 12 }, /* 6 Mb */
[5] = { RC_INVALID, WLAN_RC_PHY_OFDM, 9000, [5] = { RC_INVALID, WLAN_RC_PHY_OFDM, 9000,
7800, 5, 18, 4, 5, 5, 5 }, /* 9 Mb */ 7800, 5, 18 }, /* 9 Mb */
[6] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 12000, [6] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 12000,
10100, 6, 24, 6, 6, 6, 6 }, /* 12 Mb */ 10100, 6, 24 }, /* 12 Mb */
[7] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 18000, [7] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 18000,
14100, 7, 36, 6, 7, 7, 7 }, /* 18 Mb */ 14100, 7, 36 }, /* 18 Mb */
[8] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 24000, [8] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 24000,
17700, 8, 48, 8, 8, 8, 8 }, /* 24 Mb */ 17700, 8, 48 }, /* 24 Mb */
[9] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 36000, [9] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 36000,
23700, 9, 72, 8, 9, 9, 9 }, /* 36 Mb */ 23700, 9, 72 }, /* 36 Mb */
[10] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 48000, [10] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 48000,
27400, 10, 96, 8, 10, 10, 10 }, /* 48 Mb */ 27400, 10, 96 }, /* 48 Mb */
[11] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 54000, [11] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 54000,
30900, 11, 108, 8, 11, 11, 11 }, /* 54 Mb */ 30900, 11, 108 }, /* 54 Mb */
[12] = { RC_INVALID, WLAN_RC_PHY_HT_20_SS, 6500, [12] = { RC_INVALID, WLAN_RC_PHY_HT_20_SS, 6500,
6400, 0, 0, 4, 42, 12, 42 }, /* 6.5 Mb */ 6400, 0, 0 }, /* 6.5 Mb */
[13] = { RC_HT_SDT_20, WLAN_RC_PHY_HT_20_SS, 13000, [13] = { RC_HT_SDT_20, WLAN_RC_PHY_HT_20_SS, 13000,
12700, 1, 1, 6, 43, 13, 43 }, /* 13 Mb */ 12700, 1, 1 }, /* 13 Mb */
[14] = { RC_HT_SDT_20, WLAN_RC_PHY_HT_20_SS, 19500, [14] = { RC_HT_SDT_20, WLAN_RC_PHY_HT_20_SS, 19500,
18800, 2, 2, 6, 44, 14, 44 }, /* 19.5 Mb*/ 18800, 2, 2 }, /* 19.5 Mb*/
[15] = { RC_HT_SD_20, WLAN_RC_PHY_HT_20_SS, 26000, [15] = { RC_HT_SD_20, WLAN_RC_PHY_HT_20_SS, 26000,
25000, 3, 3, 8, 45, 15, 45 }, /* 26 Mb */ 25000, 3, 3 }, /* 26 Mb */
[16] = { RC_HT_SD_20, WLAN_RC_PHY_HT_20_SS, 39000, [16] = { RC_HT_SD_20, WLAN_RC_PHY_HT_20_SS, 39000,
36700, 4, 4, 8, 46, 16, 46 }, /* 39 Mb */ 36700, 4, 4 }, /* 39 Mb */
[17] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 52000, [17] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 52000,
48100, 5, 5, 8, 47, 17, 47 }, /* 52 Mb */ 48100, 5, 5 }, /* 52 Mb */
[18] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 58500, [18] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 58500,
53500, 6, 6, 8, 48, 18, 48 }, /* 58.5 Mb */ 53500, 6, 6 }, /* 58.5 Mb */
[19] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 65000, [19] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 65000,
59000, 7, 7, 8, 49, 20, 50 }, /* 65 Mb */ 59000, 7, 7 }, /* 65 Mb */
[20] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS_HGI, 72200, [20] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS_HGI, 72200,
65400, 7, 7, 8, 49, 20, 50 }, /* 65 Mb*/ 65400, 7, 7 }, /* 65 Mb*/
[21] = { RC_INVALID, WLAN_RC_PHY_HT_20_DS, 13000, [21] = { RC_INVALID, WLAN_RC_PHY_HT_20_DS, 13000,
12700, 8, 8, 4, 51, 21, 51 }, /* 13 Mb */ 12700, 8, 8 }, /* 13 Mb */
[22] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_DS, 26000, [22] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_DS, 26000,
24800, 9, 9, 6, 52, 22, 52 }, /* 26 Mb */ 24800, 9, 9 }, /* 26 Mb */
[23] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_DS, 39000, [23] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_DS, 39000,
36600, 10, 10, 6, 53, 23, 53 }, /* 39 Mb */ 36600, 10, 10 }, /* 39 Mb */
[24] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 52000, [24] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 52000,
48100, 11, 11, 8, 54, 24, 54 }, /* 52 Mb */ 48100, 11, 11 }, /* 52 Mb */
[25] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 78000, [25] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 78000,
69500, 12, 12, 8, 55, 25, 55 }, /* 78 Mb */ 69500, 12, 12 }, /* 78 Mb */
[26] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 104000, [26] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 104000,
89500, 13, 13, 8, 56, 26, 56 }, /* 104 Mb */ 89500, 13, 13 }, /* 104 Mb */
[27] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 117000, [27] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 117000,
98900, 14, 14, 8, 57, 27, 57 }, /* 117 Mb */ 98900, 14, 14 }, /* 117 Mb */
[28] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 130000, [28] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 130000,
108300, 15, 15, 8, 58, 29, 59 }, /* 130 Mb */ 108300, 15, 15 }, /* 130 Mb */
[29] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS_HGI, 144400, [29] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS_HGI, 144400,
120000, 15, 15, 8, 58, 29, 59 }, /* 144.4 Mb */ 120000, 15, 15 }, /* 144.4 Mb */
[30] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 19500, [30] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 19500,
17400, 16, 16, 4, 60, 30, 60 }, /* 19.5 Mb */ 17400, 16, 16 }, /* 19.5 Mb */
[31] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 39000, [31] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 39000,
35100, 17, 17, 6, 61, 31, 61 }, /* 39 Mb */ 35100, 17, 17 }, /* 39 Mb */
[32] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 58500, [32] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 58500,
52600, 18, 18, 6, 62, 32, 62 }, /* 58.5 Mb */ 52600, 18, 18 }, /* 58.5 Mb */
[33] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 78000, [33] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 78000,
70400, 19, 19, 8, 63, 33, 63 }, /* 78 Mb */ 70400, 19, 19 }, /* 78 Mb */
[34] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 117000, [34] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 117000,
104900, 20, 20, 8, 64, 35, 65 }, /* 117 Mb */ 104900, 20, 20 }, /* 117 Mb */
[35] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS_HGI, 130000, [35] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS_HGI, 130000,
115800, 20, 20, 8, 64, 35, 65 }, /* 130 Mb */ 115800, 20, 20 }, /* 130 Mb */
[36] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 156000, [36] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 156000,
137200, 21, 21, 8, 66, 37, 67 }, /* 156 Mb */ 137200, 21, 21 }, /* 156 Mb */
[37] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 173300, [37] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 173300,
151100, 21, 21, 8, 66, 37, 67 }, /* 173.3 Mb */ 151100, 21, 21 }, /* 173.3 Mb */
[38] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 175500, [38] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 175500,
152800, 22, 22, 8, 68, 39, 69 }, /* 175.5 Mb */ 152800, 22, 22 }, /* 175.5 Mb */
[39] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 195000, [39] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 195000,
168400, 22, 22, 8, 68, 39, 69 }, /* 195 Mb */ 168400, 22, 22 }, /* 195 Mb */
[40] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 195000, [40] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 195000,
168400, 23, 23, 8, 70, 41, 71 }, /* 195 Mb */ 168400, 23, 23 }, /* 195 Mb */
[41] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 216700, [41] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 216700,
185000, 23, 23, 8, 70, 41, 71 }, /* 216.7 Mb */ 185000, 23, 23 }, /* 216.7 Mb */
[42] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 13500, [42] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 13500,
13200, 0, 0, 8, 42, 42, 42 }, /* 13.5 Mb */ 13200, 0, 0 }, /* 13.5 Mb */
[43] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 27500, [43] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 27500,
25900, 1, 1, 8, 43, 43, 43 }, /* 27.0 Mb */ 25900, 1, 1 }, /* 27.0 Mb */
[44] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 40500, [44] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 40500,
38600, 2, 2, 8, 44, 44, 44 }, /* 40.5 Mb */ 38600, 2, 2 }, /* 40.5 Mb */
[45] = { RC_HT_SD_40, WLAN_RC_PHY_HT_40_SS, 54000, [45] = { RC_HT_SD_40, WLAN_RC_PHY_HT_40_SS, 54000,
49800, 3, 3, 8, 45, 45, 45 }, /* 54 Mb */ 49800, 3, 3 }, /* 54 Mb */
[46] = { RC_HT_SD_40, WLAN_RC_PHY_HT_40_SS, 81500, [46] = { RC_HT_SD_40, WLAN_RC_PHY_HT_40_SS, 81500,
72200, 4, 4, 8, 46, 46, 46 }, /* 81 Mb */ 72200, 4, 4 }, /* 81 Mb */
[47] = { RC_HT_S_40 , WLAN_RC_PHY_HT_40_SS, 108000, [47] = { RC_HT_S_40 , WLAN_RC_PHY_HT_40_SS, 108000,
92900, 5, 5, 8, 47, 47, 47 }, /* 108 Mb */ 92900, 5, 5 }, /* 108 Mb */
[48] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 121500, [48] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 121500,
102700, 6, 6, 8, 48, 48, 48 }, /* 121.5 Mb */ 102700, 6, 6 }, /* 121.5 Mb */
[49] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 135000, [49] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 135000,
112000, 7, 7, 8, 49, 50, 50 }, /* 135 Mb */ 112000, 7, 7 }, /* 135 Mb */
[50] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS_HGI, 150000, [50] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS_HGI, 150000,
122000, 7, 7, 8, 49, 50, 50 }, /* 150 Mb */ 122000, 7, 7 }, /* 150 Mb */
[51] = { RC_INVALID, WLAN_RC_PHY_HT_40_DS, 27000, [51] = { RC_INVALID, WLAN_RC_PHY_HT_40_DS, 27000,
25800, 8, 8, 8, 51, 51, 51 }, /* 27 Mb */ 25800, 8, 8 }, /* 27 Mb */
[52] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_DS, 54000, [52] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_DS, 54000,
49800, 9, 9, 8, 52, 52, 52 }, /* 54 Mb */ 49800, 9, 9 }, /* 54 Mb */
[53] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_DS, 81000, [53] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_DS, 81000,
71900, 10, 10, 8, 53, 53, 53 }, /* 81 Mb */ 71900, 10, 10 }, /* 81 Mb */
[54] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 108000, [54] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 108000,
92500, 11, 11, 8, 54, 54, 54 }, /* 108 Mb */ 92500, 11, 11 }, /* 108 Mb */
[55] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 162000, [55] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 162000,
130300, 12, 12, 8, 55, 55, 55 }, /* 162 Mb */ 130300, 12, 12 }, /* 162 Mb */
[56] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 216000, [56] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 216000,
162800, 13, 13, 8, 56, 56, 56 }, /* 216 Mb */ 162800, 13, 13 }, /* 216 Mb */
[57] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 243000, [57] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 243000,
178200, 14, 14, 8, 57, 57, 57 }, /* 243 Mb */ 178200, 14, 14 }, /* 243 Mb */
[58] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 270000, [58] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 270000,
192100, 15, 15, 8, 58, 59, 59 }, /* 270 Mb */ 192100, 15, 15 }, /* 270 Mb */
[59] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS_HGI, 300000, [59] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS_HGI, 300000,
207000, 15, 15, 8, 58, 59, 59 }, /* 300 Mb */ 207000, 15, 15 }, /* 300 Mb */
[60] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 40500, [60] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 40500,
36100, 16, 16, 8, 60, 60, 60 }, /* 40.5 Mb */ 36100, 16, 16 }, /* 40.5 Mb */
[61] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 81000, [61] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 81000,
72900, 17, 17, 8, 61, 61, 61 }, /* 81 Mb */ 72900, 17, 17 }, /* 81 Mb */
[62] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 121500, [62] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 121500,
108300, 18, 18, 8, 62, 62, 62 }, /* 121.5 Mb */ 108300, 18, 18 }, /* 121.5 Mb */
[63] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 162000, [63] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 162000,
142000, 19, 19, 8, 63, 63, 63 }, /* 162 Mb */ 142000, 19, 19 }, /* 162 Mb */
[64] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 243000, [64] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 243000,
205100, 20, 20, 8, 64, 65, 65 }, /* 243 Mb */ 205100, 20, 20 }, /* 243 Mb */
[65] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS_HGI, 270000, [65] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS_HGI, 270000,
224700, 20, 20, 8, 64, 65, 65 }, /* 270 Mb */ 224700, 20, 20 }, /* 270 Mb */
[66] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 324000, [66] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 324000,
263100, 21, 21, 8, 66, 67, 67 }, /* 324 Mb */ 263100, 21, 21 }, /* 324 Mb */
[67] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 360000, [67] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 360000,
288000, 21, 21, 8, 66, 67, 67 }, /* 360 Mb */ 288000, 21, 21 }, /* 360 Mb */
[68] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 364500, [68] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 364500,
290700, 22, 22, 8, 68, 69, 69 }, /* 364.5 Mb */ 290700, 22, 22 }, /* 364.5 Mb */
[69] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 405000, [69] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 405000,
317200, 22, 22, 8, 68, 69, 69 }, /* 405 Mb */ 317200, 22, 22 }, /* 405 Mb */
[70] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 405000, [70] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 405000,
317200, 23, 23, 8, 70, 71, 71 }, /* 405 Mb */ 317200, 23, 23 }, /* 405 Mb */
[71] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 450000, [71] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 450000,
346400, 23, 23, 8, 70, 71, 71 }, /* 450 Mb */ 346400, 23, 23 }, /* 450 Mb */
}, },
50, /* probe interval */ 50, /* probe interval */
WLAN_RC_HT_FLAG, /* Phy rates allowed initially */ WLAN_RC_HT_FLAG, /* Phy rates allowed initially */
...@@ -326,21 +326,21 @@ static const struct ath_rate_table ar5416_11a_ratetable = { ...@@ -326,21 +326,21 @@ static const struct ath_rate_table ar5416_11a_ratetable = {
0, 0,
{ {
{ RC_L_SDT, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */ { RC_L_SDT, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
5400, 0, 12, 0}, 5400, 0, 12},
{ RC_L_SDT, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */ { RC_L_SDT, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
7800, 1, 18, 0}, 7800, 1, 18},
{ RC_L_SDT, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */ { RC_L_SDT, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
10000, 2, 24, 2}, 10000, 2, 24},
{ RC_L_SDT, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */ { RC_L_SDT, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
13900, 3, 36, 2}, 13900, 3, 36},
{ RC_L_SDT, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */ { RC_L_SDT, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
17300, 4, 48, 4}, 17300, 4, 48},
{ RC_L_SDT, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */ { RC_L_SDT, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
23000, 5, 72, 4}, 23000, 5, 72},
{ RC_L_SDT, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */ { RC_L_SDT, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
27400, 6, 96, 4}, 27400, 6, 96},
{ RC_L_SDT, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */ { RC_L_SDT, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
29300, 7, 108, 4}, 29300, 7, 108},
}, },
50, /* probe interval */ 50, /* probe interval */
0, /* Phy rates allowed initially */ 0, /* Phy rates allowed initially */
...@@ -351,56 +351,55 @@ static const struct ath_rate_table ar5416_11g_ratetable = { ...@@ -351,56 +351,55 @@ static const struct ath_rate_table ar5416_11g_ratetable = {
0, 0,
{ {
{ RC_L_SDT, WLAN_RC_PHY_CCK, 1000, /* 1 Mb */ { RC_L_SDT, WLAN_RC_PHY_CCK, 1000, /* 1 Mb */
900, 0, 2, 0}, 900, 0, 2},
{ RC_L_SDT, WLAN_RC_PHY_CCK, 2000, /* 2 Mb */ { RC_L_SDT, WLAN_RC_PHY_CCK, 2000, /* 2 Mb */
1900, 1, 4, 1}, 1900, 1, 4},
{ RC_L_SDT, WLAN_RC_PHY_CCK, 5500, /* 5.5 Mb */ { RC_L_SDT, WLAN_RC_PHY_CCK, 5500, /* 5.5 Mb */
4900, 2, 11, 2}, 4900, 2, 11},
{ RC_L_SDT, WLAN_RC_PHY_CCK, 11000, /* 11 Mb */ { RC_L_SDT, WLAN_RC_PHY_CCK, 11000, /* 11 Mb */
8100, 3, 22, 3}, 8100, 3, 22},
{ RC_INVALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */ { RC_INVALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
5400, 4, 12, 4}, 5400, 4, 12},
{ RC_INVALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */ { RC_INVALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
7800, 5, 18, 4}, 7800, 5, 18},
{ RC_L_SDT, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */ { RC_L_SDT, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
10000, 6, 24, 6}, 10000, 6, 24},
{ RC_L_SDT, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */ { RC_L_SDT, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
13900, 7, 36, 6}, 13900, 7, 36},
{ RC_L_SDT, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */ { RC_L_SDT, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
17300, 8, 48, 8}, 17300, 8, 48},
{ RC_L_SDT, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */ { RC_L_SDT, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
23000, 9, 72, 8}, 23000, 9, 72},
{ RC_L_SDT, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */ { RC_L_SDT, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
27400, 10, 96, 8}, 27400, 10, 96},
{ RC_L_SDT, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */ { RC_L_SDT, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
29300, 11, 108, 8}, 29300, 11, 108},
}, },
50, /* probe interval */ 50, /* probe interval */
0, /* Phy rates allowed initially */ 0, /* Phy rates allowed initially */
}; };
static int ath_rc_get_rateindex(const struct ath_rate_table *rate_table, static int ath_rc_get_rateindex(struct ath_rate_priv *ath_rc_priv,
struct ieee80211_tx_rate *rate) struct ieee80211_tx_rate *rate)
{ {
int rix = 0, i = 0; const struct ath_rate_table *rate_table = ath_rc_priv->rate_table;
static const int mcs_rix_off[] = { 7, 15, 20, 21, 22, 23 }; int rix, i, idx = 0;
if (!(rate->flags & IEEE80211_TX_RC_MCS)) if (!(rate->flags & IEEE80211_TX_RC_MCS))
return rate->idx; return rate->idx;
while (i < ARRAY_SIZE(mcs_rix_off) && rate->idx > mcs_rix_off[i]) { for (i = 0; i < ath_rc_priv->max_valid_rate; i++) {
rix++; i++; idx = ath_rc_priv->valid_rate_index[i];
if (WLAN_RC_PHY_HT(rate_table->info[idx].phy) &&
rate_table->info[idx].ratecode == rate->idx)
break;
} }
rix += rate->idx + rate_table->mcs_start; rix = idx;
if ((rate->flags & IEEE80211_TX_RC_40_MHZ_WIDTH) && if (rate->flags & IEEE80211_TX_RC_SHORT_GI)
(rate->flags & IEEE80211_TX_RC_SHORT_GI)) rix++;
rix = rate_table->info[rix].ht_index;
else if (rate->flags & IEEE80211_TX_RC_SHORT_GI)
rix = rate_table->info[rix].sgi_index;
else if (rate->flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
rix = rate_table->info[rix].cw40index;
return rix; return rix;
} }
...@@ -1078,7 +1077,6 @@ static void ath_rc_tx_status(struct ath_softc *sc, ...@@ -1078,7 +1077,6 @@ static void ath_rc_tx_status(struct ath_softc *sc,
struct ath_rate_priv *ath_rc_priv, struct ath_rate_priv *ath_rc_priv,
struct sk_buff *skb) struct sk_buff *skb)
{ {
const struct ath_rate_table *rate_table = ath_rc_priv->rate_table;
struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
struct ieee80211_tx_rate *rates = tx_info->status.rates; struct ieee80211_tx_rate *rates = tx_info->status.rates;
struct ieee80211_tx_rate *rate; struct ieee80211_tx_rate *rate;
...@@ -1114,7 +1112,7 @@ static void ath_rc_tx_status(struct ath_softc *sc, ...@@ -1114,7 +1112,7 @@ static void ath_rc_tx_status(struct ath_softc *sc,
!(ath_rc_priv->ht_cap & WLAN_RC_40_FLAG)) !(ath_rc_priv->ht_cap & WLAN_RC_40_FLAG))
return; return;
rix = ath_rc_get_rateindex(rate_table, &rates[i]); rix = ath_rc_get_rateindex(ath_rc_priv, &rates[i]);
ath_rc_update_ht(sc, ath_rc_priv, tx_info, ath_rc_update_ht(sc, ath_rc_priv, tx_info,
rix, xretries ? 1 : 2, rix, xretries ? 1 : 2,
rates[i].count); rates[i].count);
...@@ -1129,7 +1127,7 @@ static void ath_rc_tx_status(struct ath_softc *sc, ...@@ -1129,7 +1127,7 @@ static void ath_rc_tx_status(struct ath_softc *sc,
!(ath_rc_priv->ht_cap & WLAN_RC_40_FLAG)) !(ath_rc_priv->ht_cap & WLAN_RC_40_FLAG))
return; return;
rix = ath_rc_get_rateindex(rate_table, &rates[final_ts_idx]); rix = ath_rc_get_rateindex(ath_rc_priv, &rates[final_ts_idx]);
ath_rc_update_ht(sc, ath_rc_priv, tx_info, rix, xretries, long_retry); ath_rc_update_ht(sc, ath_rc_priv, tx_info, rix, xretries, long_retry);
ath_debug_stat_rc(ath_rc_priv, rix); ath_debug_stat_rc(ath_rc_priv, rix);
} }
......
drivers/net/wireless/ath/ath9k/rc.h
浏览文件 @ 23d99394
...@@ -160,10 +160,6 @@ struct ath_rate_table { ...@@ -160,10 +160,6 @@ struct ath_rate_table {
u32 user_ratekbps; u32 user_ratekbps;
u8 ratecode; u8 ratecode;
u8 dot11rate; u8 dot11rate;
u8 ctrl_rate;
u8 cw40index;
u8 sgi_index;
u8 ht_index;
} info[RATE_TABLE_SIZE]; } info[RATE_TABLE_SIZE];
u32 probe_interval; u32 probe_interval;
u8 initial_ratemax; u8 initial_ratemax;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或