diff options
| author | Senthil Balasubramanian <senthilkumar@atheros.com> | 2010-07-27 09:46:34 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-07-27 14:59:59 -0400 |
| commit | aaa41ec4257ccd2e972fd505c1791cfabfcd5763 (patch) | |
| tree | 34aafa1225dcd7fc9bc5df63d599d005d864143f /drivers | |
| parent | 812c7c35a0fb6081e492cfa890947c54fe5844fd (diff) | |
ath9k: remove unused base_index from rate table.
base index is not used anymore and so remove it.
Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/rc.c | 320 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/rc.h | 1 |
2 files changed, 160 insertions, 161 deletions
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c index 5c9df3b2104d..e49be733d546 100644 --- a/drivers/net/wireless/ath/ath9k/rc.c +++ b/drivers/net/wireless/ath/ath9k/rc.c | |||
| @@ -24,141 +24,141 @@ static const struct ath_rate_table ar5416_11na_ratetable = { | |||
| 24 | 8, /* MCS start */ | 24 | 8, /* MCS start */ |
| 25 | { | 25 | { |
| 26 | [0] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 6000, | 26 | [0] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 6000, |
| 27 | 5400, 0, 12, 0, 0, 0, 0, 0 }, /* 6 Mb */ | 27 | 5400, 0, 12, 0, 0, 0, 0 }, /* 6 Mb */ |
| 28 | [1] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 9000, | 28 | [1] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 9000, |
| 29 | 7800, 1, 18, 0, 1, 1, 1, 1 }, /* 9 Mb */ | 29 | 7800, 1, 18, 0, 1, 1, 1 }, /* 9 Mb */ |
| 30 | [2] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 12000, | 30 | [2] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 12000, |
| 31 | 10000, 2, 24, 2, 2, 2, 2, 2 }, /* 12 Mb */ | 31 | 10000, 2, 24, 2, 2, 2, 2 }, /* 12 Mb */ |
| 32 | [3] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 18000, | 32 | [3] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 18000, |
| 33 | 13900, 3, 36, 2, 3, 3, 3, 3 }, /* 18 Mb */ | 33 | 13900, 3, 36, 2, 3, 3, 3 }, /* 18 Mb */ |
| 34 | [4] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 24000, | 34 | [4] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 24000, |
| 35 | 17300, 4, 48, 4, 4, 4, 4, 4 }, /* 24 Mb */ | 35 | 17300, 4, 48, 4, 4, 4, 4 }, /* 24 Mb */ |
| 36 | [5] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 36000, | 36 | [5] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 36000, |
| 37 | 23000, 5, 72, 4, 5, 5, 5, 5 }, /* 36 Mb */ | 37 | 23000, 5, 72, 4, 5, 5, 5 }, /* 36 Mb */ |
| 38 | [6] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 48000, | 38 | [6] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 48000, |
| 39 | 27400, 6, 96, 4, 6, 6, 6, 6 }, /* 48 Mb */ | 39 | 27400, 6, 96, 4, 6, 6, 6 }, /* 48 Mb */ |
| 40 | [7] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 54000, | 40 | [7] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 54000, |
| 41 | 29300, 7, 108, 4, 7, 7, 7, 7 }, /* 54 Mb */ | 41 | 29300, 7, 108, 4, 7, 7, 7 }, /* 54 Mb */ |
| 42 | [8] = { RC_HT_SDT_2040, WLAN_RC_PHY_HT_20_SS, 6500, | 42 | [8] = { RC_HT_SDT_2040, WLAN_RC_PHY_HT_20_SS, 6500, |
| 43 | 6400, 0, 0, 0, 8, 38, 8, 38 }, /* 6.5 Mb */ | 43 | 6400, 0, 0, 0, 38, 8, 38 }, /* 6.5 Mb */ |
| 44 | [9] = { RC_HT_SDT_20, WLAN_RC_PHY_HT_20_SS, 13000, | 44 | [9] = { RC_HT_SDT_20, WLAN_RC_PHY_HT_20_SS, 13000, |
| 45 | 12700, 1, 1, 2, 9, 39, 9, 39 }, /* 13 Mb */ | 45 | 12700, 1, 1, 2, 39, 9, 39 }, /* 13 Mb */ |
| 46 | [10] = { RC_HT_SDT_20, WLAN_RC_PHY_HT_20_SS, 19500, | 46 | [10] = { RC_HT_SDT_20, WLAN_RC_PHY_HT_20_SS, 19500, |
| 47 | 18800, 2, 2, 2, 10, 40, 10, 40 }, /* 19.5 Mb */ | 47 | 18800, 2, 2, 2, 40, 10, 40 }, /* 19.5 Mb */ |
| 48 | [11] = { RC_HT_SD_20, WLAN_RC_PHY_HT_20_SS, 26000, | 48 | [11] = { RC_HT_SD_20, WLAN_RC_PHY_HT_20_SS, 26000, |
| 49 | 25000, 3, 3, 4, 11, 41, 11, 41 }, /* 26 Mb */ | 49 | 25000, 3, 3, 4, 41, 11, 41 }, /* 26 Mb */ |
| 50 | [12] = { RC_HT_SD_20, WLAN_RC_PHY_HT_20_SS, 39000, | 50 | [12] = { RC_HT_SD_20, WLAN_RC_PHY_HT_20_SS, 39000, |
| 51 | 36700, 4, 4, 4, 12, 42, 12, 42 }, /* 39 Mb */ | 51 | 36700, 4, 4, 4, 42, 12, 42 }, /* 39 Mb */ |
| 52 | [13] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 52000, | 52 | [13] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 52000, |
| 53 | 48100, 5, 5, 4, 13, 43, 13, 43 }, /* 52 Mb */ | 53 | 48100, 5, 5, 4, 43, 13, 43 }, /* 52 Mb */ |
| 54 | [14] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 58500, | 54 | [14] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 58500, |
| 55 | 53500, 6, 6, 4, 14, 44, 14, 44 }, /* 58.5 Mb */ | 55 | 53500, 6, 6, 4, 44, 14, 44 }, /* 58.5 Mb */ |
| 56 | [15] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 65000, | 56 | [15] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 65000, |
| 57 | 59000, 7, 7, 4, 15, 45, 16, 46 }, /* 65 Mb */ | 57 | 59000, 7, 7, 4, 45, 16, 46 }, /* 65 Mb */ |
| 58 | [16] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS_HGI, 72200, | 58 | [16] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS_HGI, 72200, |
| 59 | 65400, 7, 7, 4, 15, 45, 16, 46 }, /* 75 Mb */ | 59 | 65400, 7, 7, 4, 45, 16, 46 }, /* 75 Mb */ |
| 60 | [17] = { RC_INVALID, WLAN_RC_PHY_HT_20_DS, 13000, | 60 | [17] = { RC_INVALID, WLAN_RC_PHY_HT_20_DS, 13000, |
| 61 | 12700, 8, 8, 0, 16, 47, 17, 47 }, /* 13 Mb */ | 61 | 12700, 8, 8, 0, 47, 17, 47 }, /* 13 Mb */ |
| 62 | [18] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_DS, 26000, | 62 | [18] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_DS, 26000, |
| 63 | 24800, 9, 9, 2, 17, 48, 18, 48 }, /* 26 Mb */ | 63 | 24800, 9, 9, 2, 48, 18, 48 }, /* 26 Mb */ |
| 64 | [19] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_DS, 39000, | 64 | [19] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_DS, 39000, |
| 65 | 36600, 10, 10, 2, 18, 49, 19, 49 }, /* 39 Mb */ | 65 | 36600, 10, 10, 2, 49, 19, 49 }, /* 39 Mb */ |
| 66 | [20] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 52000, | 66 | [20] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 52000, |
| 67 | 48100, 11, 11, 4, 19, 50, 20, 50 }, /* 52 Mb */ | 67 | 48100, 11, 11, 4, 50, 20, 50 }, /* 52 Mb */ |
| 68 | [21] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 78000, | 68 | [21] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 78000, |
| 69 | 69500, 12, 12, 4, 20, 51, 21, 51 }, /* 78 Mb */ | 69 | 69500, 12, 12, 4, 51, 21, 51 }, /* 78 Mb */ |
| 70 | [22] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 104000, | 70 | [22] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 104000, |
| 71 | 89500, 13, 13, 4, 21, 52, 22, 52 }, /* 104 Mb */ | 71 | 89500, 13, 13, 4, 52, 22, 52 }, /* 104 Mb */ |
| 72 | [23] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 117000, | 72 | [23] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 117000, |
| 73 | 98900, 14, 14, 4, 22, 53, 23, 53 }, /* 117 Mb */ | 73 | 98900, 14, 14, 4, 53, 23, 53 }, /* 117 Mb */ |
| 74 | [24] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 130000, | 74 | [24] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 130000, |
| 75 | 108300, 15, 15, 4, 23, 54, 25, 55 }, /* 130 Mb */ | 75 | 108300, 15, 15, 4, 54, 25, 55 }, /* 130 Mb */ |
| 76 | [25] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS_HGI, 144400, | 76 | [25] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS_HGI, 144400, |
| 77 | 120000, 15, 15, 4, 23, 54, 25, 55 }, /* 144.4 Mb */ | 77 | 120000, 15, 15, 4, 54, 25, 55 }, /* 144.4 Mb */ |
| 78 | [26] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 19500, | 78 | [26] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 19500, |
| 79 | 17400, 16, 16, 0, 24, 56, 26, 56 }, /* 19.5 Mb */ | 79 | 17400, 16, 16, 0, 56, 26, 56 }, /* 19.5 Mb */ |
| 80 | [27] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 39000, | 80 | [27] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 39000, |
| 81 | 35100, 17, 17, 2, 25, 57, 27, 57 }, /* 39 Mb */ | 81 | 35100, 17, 17, 2, 57, 27, 57 }, /* 39 Mb */ |
| 82 | [28] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 58500, | 82 | [28] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 58500, |
| 83 | 52600, 18, 18, 2, 26, 58, 28, 58 }, /* 58.5 Mb */ | 83 | 52600, 18, 18, 2, 58, 28, 58 }, /* 58.5 Mb */ |
| 84 | [29] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 78000, | 84 | [29] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 78000, |
| 85 | 70400, 19, 19, 4, 27, 59, 29, 59 }, /* 78 Mb */ | 85 | 70400, 19, 19, 4, 59, 29, 59 }, /* 78 Mb */ |
| 86 | [30] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 117000, | 86 | [30] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 117000, |
| 87 | 104900, 20, 20, 4, 28, 60, 31, 61 }, /* 117 Mb */ | 87 | 104900, 20, 20, 4, 60, 31, 61 }, /* 117 Mb */ |
| 88 | [31] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS_HGI, 130000, | 88 | [31] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS_HGI, 130000, |
| 89 | 115800, 20, 20, 4, 28, 60, 31, 61 }, /* 130 Mb*/ | 89 | 115800, 20, 20, 4, 60, 31, 61 }, /* 130 Mb*/ |
| 90 | [32] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 156000, | 90 | [32] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 156000, |
| 91 | 137200, 21, 21, 4, 29, 62, 33, 63 }, /* 156 Mb */ | 91 | 137200, 21, 21, 4, 62, 33, 63 }, /* 156 Mb */ |
| 92 | [33] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 173300, | 92 | [33] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 173300, |
| 93 | 151100, 21, 21, 4, 29, 62, 33, 63 }, /* 173.3 Mb */ | 93 | 151100, 21, 21, 4, 62, 33, 63 }, /* 173.3 Mb */ |
| 94 | [34] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 175500, | 94 | [34] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 175500, |
| 95 | 152800, 22, 22, 4, 30, 64, 35, 65 }, /* 175.5 Mb */ | 95 | 152800, 22, 22, 4, 64, 35, 65 }, /* 175.5 Mb */ |
| 96 | [35] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 195000, | 96 | [35] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 195000, |
| 97 | 168400, 22, 22, 4, 30, 64, 35, 65 }, /* 195 Mb*/ | 97 | 168400, 22, 22, 4, 64, 35, 65 }, /* 195 Mb*/ |
| 98 | [36] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 195000, | 98 | [36] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 195000, |
| 99 | 168400, 23, 23, 4, 31, 66, 37, 67 }, /* 195 Mb */ | 99 | 168400, 23, 23, 4, 66, 37, 67 }, /* 195 Mb */ |
| 100 | [37] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 216700, | 100 | [37] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 216700, |
| 101 | 185000, 23, 23, 4, 31, 66, 37, 67 }, /* 216.7 Mb */ | 101 | 185000, 23, 23, 4, 66, 37, 67 }, /* 216.7 Mb */ |
| 102 | [38] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 13500, | 102 | [38] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 13500, |
| 103 | 13200, 0, 0, 0, 8, 38, 38, 38 }, /* 13.5 Mb*/ | 103 | 13200, 0, 0, 0, 38, 38, 38 }, /* 13.5 Mb*/ |
| 104 | [39] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 27500, | 104 | [39] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 27500, |
| 105 | 25900, 1, 1, 2, 9, 39, 39, 39 }, /* 27.0 Mb*/ | 105 | 25900, 1, 1, 2, 39, 39, 39 }, /* 27.0 Mb*/ |
| 106 | [40] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 40500, | 106 | [40] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 40500, |
| 107 | 38600, 2, 2, 2, 10, 40, 40, 40 }, /* 40.5 Mb*/ | 107 | 38600, 2, 2, 2, 40, 40, 40 }, /* 40.5 Mb*/ |
| 108 | [41] = { RC_HT_SD_40, WLAN_RC_PHY_HT_40_SS, 54000, | 108 | [41] = { RC_HT_SD_40, WLAN_RC_PHY_HT_40_SS, 54000, |
| 109 | 49800, 3, 3, 4, 11, 41, 41, 41 }, /* 54 Mb */ | 109 | 49800, 3, 3, 4, 41, 41, 41 }, /* 54 Mb */ |
| 110 | [42] = { RC_HT_SD_40, WLAN_RC_PHY_HT_40_SS, 81500, | 110 | [42] = { RC_HT_SD_40, WLAN_RC_PHY_HT_40_SS, 81500, |
| 111 | 72200, 4, 4, 4, 12, 42, 42, 42 }, /* 81 Mb */ | 111 | 72200, 4, 4, 4, 42, 42, 42 }, /* 81 Mb */ |
| 112 | [43] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 108000, | 112 | [43] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 108000, |
| 113 | 92900, 5, 5, 4, 13, 43, 43, 43 }, /* 108 Mb */ | 113 | 92900, 5, 5, 4, 43, 43, 43 }, /* 108 Mb */ |
| 114 | [44] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 121500, | 114 | [44] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 121500, |
| 115 | 102700, 6, 6, 4, 14, 44, 44, 44 }, /* 121.5 Mb*/ | 115 | 102700, 6, 6, 4, 44, 44, 44 }, /* 121.5 Mb*/ |
| 116 | [45] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 135000, | 116 | [45] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 135000, |
| 117 | 112000, 7, 7, 4, 15, 45, 46, 46 }, /* 135 Mb */ | 117 | 112000, 7, 7, 4, 45, 46, 46 }, /* 135 Mb */ |
| 118 | [46] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS_HGI, 150000, | 118 | [46] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS_HGI, 150000, |
| 119 | 122000, 7, 7, 4, 15, 45, 46, 46 }, /* 150 Mb */ | 119 | 122000, 7, 7, 4, 45, 46, 46 }, /* 150 Mb */ |
| 120 | [47] = { RC_INVALID, WLAN_RC_PHY_HT_40_DS, 27000, | 120 | [47] = { RC_INVALID, WLAN_RC_PHY_HT_40_DS, 27000, |
| 121 | 25800, 8, 8, 0, 16, 47, 47, 47 }, /* 27 Mb */ | 121 | 25800, 8, 8, 0, 47, 47, 47 }, /* 27 Mb */ |
| 122 | [48] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_DS, 54000, | 122 | [48] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_DS, 54000, |
| 123 | 49800, 9, 9, 2, 17, 48, 48, 48 }, /* 54 Mb */ | 123 | 49800, 9, 9, 2, 48, 48, 48 }, /* 54 Mb */ |
| 124 | [49] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_DS, 81000, | 124 | [49] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_DS, 81000, |
| 125 | 71900, 10, 10, 2, 18, 49, 49, 49 }, /* 81 Mb */ | 125 | 71900, 10, 10, 2, 49, 49, 49 }, /* 81 Mb */ |
| 126 | [50] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 108000, | 126 | [50] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 108000, |
| 127 | 92500, 11, 11, 4, 19, 50, 50, 50 }, /* 108 Mb */ | 127 | 92500, 11, 11, 4, 50, 50, 50 }, /* 108 Mb */ |
| 128 | [51] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 162000, | 128 | [51] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 162000, |
| 129 | 130300, 12, 12, 4, 20, 51, 51, 51 }, /* 162 Mb */ | 129 | 130300, 12, 12, 4, 51, 51, 51 }, /* 162 Mb */ |
| 130 | [52] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 216000, | 130 | [52] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 216000, |
| 131 | 162800, 13, 13, 4, 21, 52, 52, 52 }, /* 216 Mb */ | 131 | 162800, 13, 13, 4, 52, 52, 52 }, /* 216 Mb */ |
| 132 | [53] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 243000, | 132 | [53] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 243000, |
| 133 | 178200, 14, 14, 4, 22, 53, 53, 53 }, /* 243 Mb */ | 133 | 178200, 14, 14, 4, 53, 53, 53 }, /* 243 Mb */ |
| 134 | [54] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 270000, | 134 | [54] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 270000, |
| 135 | 192100, 15, 15, 4, 23, 54, 55, 55 }, /* 270 Mb */ | 135 | 192100, 15, 15, 4, 54, 55, 55 }, /* 270 Mb */ |
| 136 | [55] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS_HGI, 300000, | 136 | [55] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS_HGI, 300000, |
| 137 | 207000, 15, 15, 4, 23, 54, 55, 55 }, /* 300 Mb */ | 137 | 207000, 15, 15, 4, 54, 55, 55 }, /* 300 Mb */ |
| 138 | [56] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 40500, | 138 | [56] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 40500, |
| 139 | 36100, 16, 16, 0, 24, 56, 56, 56 }, /* 40.5 Mb */ | 139 | 36100, 16, 16, 0, 56, 56, 56 }, /* 40.5 Mb */ |
| 140 | [57] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 81000, | 140 | [57] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 81000, |
| 141 | 72900, 17, 17, 2, 25, 57, 57, 57 }, /* 81 Mb */ | 141 | 72900, 17, 17, 2, 57, 57, 57 }, /* 81 Mb */ |
| 142 | [58] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 121500, | 142 | [58] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 121500, |
| 143 | 108300, 18, 18, 2, 26, 58, 58, 58 }, /* 121.5 Mb */ | 143 | 108300, 18, 18, 2, 58, 58, 58 }, /* 121.5 Mb */ |
| 144 | [59] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 162000, | 144 | [59] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 162000, |
| 145 | 142000, 19, 19, 4, 27, 59, 59, 59 }, /* 162 Mb */ | 145 | 142000, 19, 19, 4, 59, 59, 59 }, /* 162 Mb */ |
| 146 | [60] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 243000, | 146 | [60] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 243000, |
| 147 | 205100, 20, 20, 4, 28, 60, 61, 61 }, /* 243 Mb */ | 147 | 205100, 20, 20, 4, 60, 61, 61 }, /* 243 Mb */ |
| 148 | [61] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS_HGI, 270000, | 148 | [61] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS_HGI, 270000, |
| 149 | 224700, 20, 20, 4, 28, 60, 61, 61 }, /* 270 Mb */ | 149 | 224700, 20, 20, 4, 60, 61, 61 }, /* 270 Mb */ |
| 150 | [62] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 324000, | 150 | [62] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 324000, |
| 151 | 263100, 21, 21, 4, 29, 62, 63, 63 }, /* 324 Mb */ | 151 | 263100, 21, 21, 4, 62, 63, 63 }, /* 324 Mb */ |
| 152 | [63] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 360000, | 152 | [63] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 360000, |
| 153 | 288000, 21, 21, 4, 29, 62, 63, 63 }, /* 360 Mb */ | 153 | 288000, 21, 21, 4, 62, 63, 63 }, /* 360 Mb */ |
| 154 | [64] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 364500, | 154 | [64] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 364500, |
| 155 | 290700, 22, 22, 4, 30, 64, 65, 65 }, /* 364.5 Mb */ | 155 | 290700, 22, 22, 4, 64, 65, 65 }, /* 364.5 Mb */ |
| 156 | [65] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 405000, | 156 | [65] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 405000, |
| 157 | 317200, 22, 22, 4, 30, 64, 65, 65 }, /* 405 Mb */ | 157 | 317200, 22, 22, 4, 64, 65, 65 }, /* 405 Mb */ |
| 158 | [66] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 405000, | 158 | [66] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 405000, |
| 159 | 317200, 23, 23, 4, 31, 66, 67, 67 }, /* 405 Mb */ | 159 | 317200, 23, 23, 4, 66, 67, 67 }, /* 405 Mb */ |
| 160 | [67] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 450000, | 160 | [67] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 450000, |
| 161 | 346400, 23, 23, 4, 31, 66, 67, 67 }, /* 450 Mb */ | 161 | 346400, 23, 23, 4, 66, 67, 67 }, /* 450 Mb */ |
| 162 | }, | 162 | }, |
| 163 | 50, /* probe interval */ | 163 | 50, /* probe interval */ |
| 164 | WLAN_RC_HT_FLAG, /* Phy rates allowed initially */ | 164 | WLAN_RC_HT_FLAG, /* Phy rates allowed initially */ |
| @@ -172,149 +172,149 @@ static const struct ath_rate_table ar5416_11ng_ratetable = { | |||
| 172 | 12, /* MCS start */ | 172 | 12, /* MCS start */ |
| 173 | { | 173 | { |
| 174 | [0] = { RC_ALL, WLAN_RC_PHY_CCK, 1000, | 174 | [0] = { RC_ALL, WLAN_RC_PHY_CCK, 1000, |
| 175 | 900, 0, 2, 0, 0, 0, 0, 0 }, /* 1 Mb */ | 175 | 900, 0, 2, 0, 0, 0, 0 }, /* 1 Mb */ |
| 176 | [1] = { RC_ALL, WLAN_RC_PHY_CCK, 2000, | 176 | [1] = { RC_ALL, WLAN_RC_PHY_CCK, 2000, |
| 177 | 1900, 1, 4, 1, 1, 1, 1, 1 }, /* 2 Mb */ | 177 | 1900, 1, 4, 1, 1, 1, 1 }, /* 2 Mb */ |
| 178 | [2] = { RC_ALL, WLAN_RC_PHY_CCK, 5500, | 178 | [2] = { RC_ALL, WLAN_RC_PHY_CCK, 5500, |
| 179 | 4900, 2, 11, 2, 2, 2, 2, 2 }, /* 5.5 Mb */ | 179 | 4900, 2, 11, 2, 2, 2, 2 }, /* 5.5 Mb */ |
| 180 | [3] = { RC_ALL, WLAN_RC_PHY_CCK, 11000, | 180 | [3] = { RC_ALL, WLAN_RC_PHY_CCK, 11000, |
| 181 | 8100, 3, 22, 3, 3, 3, 3, 3 }, /* 11 Mb */ | 181 | 8100, 3, 22, 3, 3, 3, 3 }, /* 11 Mb */ |
| 182 | [4] = { RC_INVALID, WLAN_RC_PHY_OFDM, 6000, | 182 | [4] = { RC_INVALID, WLAN_RC_PHY_OFDM, 6000, |
| 183 | 5400, 4, 12, 4, 4, 4, 4, 4 }, /* 6 Mb */ | 183 | 5400, 4, 12, 4, 4, 4, 4 }, /* 6 Mb */ |
| 184 | [5] = { RC_INVALID, WLAN_RC_PHY_OFDM, 9000, | 184 | [5] = { RC_INVALID, WLAN_RC_PHY_OFDM, 9000, |
| 185 | 7800, 5, 18, 4, 5, 5, 5, 5 }, /* 9 Mb */ | 185 | 7800, 5, 18, 4, 5, 5, 5 }, /* 9 Mb */ |
| 186 | [6] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 12000, | 186 | [6] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 12000, |
| 187 | 10100, 6, 24, 6, 6, 6, 6, 6 }, /* 12 Mb */ | 187 | 10100, 6, 24, 6, 6, 6, 6 }, /* 12 Mb */ |
| 188 | [7] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 18000, | 188 | [7] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 18000, |
| 189 | 14100, 7, 36, 6, 7, 7, 7, 7 }, /* 18 Mb */ | 189 | 14100, 7, 36, 6, 7, 7, 7 }, /* 18 Mb */ |
| 190 | [8] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 24000, | 190 | [8] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 24000, |
| 191 | 17700, 8, 48, 8, 8, 8, 8, 8 }, /* 24 Mb */ | 191 | 17700, 8, 48, 8, 8, 8, 8 }, /* 24 Mb */ |
| 192 | [9] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 36000, | 192 | [9] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 36000, |
| 193 | 23700, 9, 72, 8, 9, 9, 9, 9 }, /* 36 Mb */ | 193 | 23700, 9, 72, 8, 9, 9, 9 }, /* 36 Mb */ |
| 194 | [10] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 48000, | 194 | [10] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 48000, |
| 195 | 27400, 10, 96, 8, 10, 10, 10, 10 }, /* 48 Mb */ | 195 | 27400, 10, 96, 8, 10, 10, 10 }, /* 48 Mb */ |
| 196 | [11] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 54000, | 196 | [11] = { RC_L_SDT, WLAN_RC_PHY_OFDM, 54000, |
| 197 | 30900, 11, 108, 8, 11, 11, 11, 11 }, /* 54 Mb */ | 197 | 30900, 11, 108, 8, 11, 11, 11 }, /* 54 Mb */ |
| 198 | [12] = { RC_INVALID, WLAN_RC_PHY_HT_20_SS, 6500, | 198 | [12] = { RC_INVALID, WLAN_RC_PHY_HT_20_SS, 6500, |
| 199 | 6400, 0, 0, 4, 12, 42, 12, 42 }, /* 6.5 Mb */ | 199 | 6400, 0, 0, 4, 42, 12, 42 }, /* 6.5 Mb */ |
| 200 | [13] = { RC_HT_SDT_20, WLAN_RC_PHY_HT_20_SS, 13000, | 200 | [13] = { RC_HT_SDT_20, WLAN_RC_PHY_HT_20_SS, 13000, |
| 201 | 12700, 1, 1, 6, 13, 43, 13, 43 }, /* 13 Mb */ | 201 | 12700, 1, 1, 6, 43, 13, 43 }, /* 13 Mb */ |
| 202 | [14] = { RC_HT_SDT_20, WLAN_RC_PHY_HT_20_SS, 19500, | 202 | [14] = { RC_HT_SDT_20, WLAN_RC_PHY_HT_20_SS, 19500, |
| 203 | 18800, 2, 2, 6, 14, 44, 14, 44 }, /* 19.5 Mb*/ | 203 | 18800, 2, 2, 6, 44, 14, 44 }, /* 19.5 Mb*/ |
| 204 | [15] = { RC_HT_SD_20, WLAN_RC_PHY_HT_20_SS, 26000, | 204 | [15] = { RC_HT_SD_20, WLAN_RC_PHY_HT_20_SS, 26000, |
| 205 | 25000, 3, 3, 8, 15, 45, 15, 45 }, /* 26 Mb */ | 205 | 25000, 3, 3, 8, 45, 15, 45 }, /* 26 Mb */ |
| 206 | [16] = { RC_HT_SD_20, WLAN_RC_PHY_HT_20_SS, 39000, | 206 | [16] = { RC_HT_SD_20, WLAN_RC_PHY_HT_20_SS, 39000, |
| 207 | 36700, 4, 4, 8, 16, 46, 16, 46 }, /* 39 Mb */ | 207 | 36700, 4, 4, 8, 46, 16, 46 }, /* 39 Mb */ |
| 208 | [17] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 52000, | 208 | [17] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 52000, |
| 209 | 48100, 5, 5, 8, 17, 47, 17, 47 }, /* 52 Mb */ | 209 | 48100, 5, 5, 8, 47, 17, 47 }, /* 52 Mb */ |
| 210 | [18] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 58500, | 210 | [18] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 58500, |
| 211 | 53500, 6, 6, 8, 18, 48, 18, 48 }, /* 58.5 Mb */ | 211 | 53500, 6, 6, 8, 48, 18, 48 }, /* 58.5 Mb */ |
| 212 | [19] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 65000, | 212 | [19] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS, 65000, |
| 213 | 59000, 7, 7, 8, 19, 49, 20, 50 }, /* 65 Mb */ | 213 | 59000, 7, 7, 8, 49, 20, 50 }, /* 65 Mb */ |
| 214 | [20] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS_HGI, 72200, | 214 | [20] = { RC_HT_S_20, WLAN_RC_PHY_HT_20_SS_HGI, 72200, |
| 215 | 65400, 7, 7, 8, 19, 49, 20, 50 }, /* 65 Mb*/ | 215 | 65400, 7, 7, 8, 49, 20, 50 }, /* 65 Mb*/ |
| 216 | [21] = { RC_INVALID, WLAN_RC_PHY_HT_20_DS, 13000, | 216 | [21] = { RC_INVALID, WLAN_RC_PHY_HT_20_DS, 13000, |
| 217 | 12700, 8, 8, 4, 20, 51, 21, 51 }, /* 13 Mb */ | 217 | 12700, 8, 8, 4, 51, 21, 51 }, /* 13 Mb */ |
| 218 | [22] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_DS, 26000, | 218 | [22] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_DS, 26000, |
| 219 | 24800, 9, 9, 6, 21, 52, 22, 52 }, /* 26 Mb */ | 219 | 24800, 9, 9, 6, 52, 22, 52 }, /* 26 Mb */ |
| 220 | [23] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_DS, 39000, | 220 | [23] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_DS, 39000, |
| 221 | 36600, 10, 10, 6, 22, 53, 23, 53 }, /* 39 Mb */ | 221 | 36600, 10, 10, 6, 53, 23, 53 }, /* 39 Mb */ |
| 222 | [24] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 52000, | 222 | [24] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 52000, |
| 223 | 48100, 11, 11, 8, 23, 54, 24, 54 }, /* 52 Mb */ | 223 | 48100, 11, 11, 8, 54, 24, 54 }, /* 52 Mb */ |
| 224 | [25] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 78000, | 224 | [25] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 78000, |
| 225 | 69500, 12, 12, 8, 24, 55, 25, 55 }, /* 78 Mb */ | 225 | 69500, 12, 12, 8, 55, 25, 55 }, /* 78 Mb */ |
| 226 | [26] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 104000, | 226 | [26] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 104000, |
| 227 | 89500, 13, 13, 8, 25, 56, 26, 56 }, /* 104 Mb */ | 227 | 89500, 13, 13, 8, 56, 26, 56 }, /* 104 Mb */ |
| 228 | [27] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 117000, | 228 | [27] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 117000, |
| 229 | 98900, 14, 14, 8, 26, 57, 27, 57 }, /* 117 Mb */ | 229 | 98900, 14, 14, 8, 57, 27, 57 }, /* 117 Mb */ |
| 230 | [28] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 130000, | 230 | [28] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS, 130000, |
| 231 | 108300, 15, 15, 8, 27, 58, 29, 59 }, /* 130 Mb */ | 231 | 108300, 15, 15, 8, 58, 29, 59 }, /* 130 Mb */ |
| 232 | [29] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS_HGI, 144400, | 232 | [29] = { RC_HT_DT_20, WLAN_RC_PHY_HT_20_DS_HGI, 144400, |
| 233 | 120000, 15, 15, 8, 27, 58, 29, 59 }, /* 144.4 Mb */ | 233 | 120000, 15, 15, 8, 58, 29, 59 }, /* 144.4 Mb */ |
| 234 | [30] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 19500, | 234 | [30] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 19500, |
| 235 | 17400, 16, 16, 4, 28, 60, 30, 60 }, /* 19.5 Mb */ | 235 | 17400, 16, 16, 4, 60, 30, 60 }, /* 19.5 Mb */ |
| 236 | [31] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 39000, | 236 | [31] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 39000, |
| 237 | 35100, 17, 17, 6, 29, 61, 31, 61 }, /* 39 Mb */ | 237 | 35100, 17, 17, 6, 61, 31, 61 }, /* 39 Mb */ |
| 238 | [32] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 58500, | 238 | [32] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 58500, |
| 239 | 52600, 18, 18, 6, 30, 62, 32, 62 }, /* 58.5 Mb */ | 239 | 52600, 18, 18, 6, 62, 32, 62 }, /* 58.5 Mb */ |
| 240 | [33] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 78000, | 240 | [33] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 78000, |
| 241 | 70400, 19, 19, 8, 31, 63, 33, 63 }, /* 78 Mb */ | 241 | 70400, 19, 19, 8, 63, 33, 63 }, /* 78 Mb */ |
| 242 | [34] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 117000, | 242 | [34] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS, 117000, |
| 243 | 104900, 20, 20, 8, 32, 64, 35, 65 }, /* 117 Mb */ | 243 | 104900, 20, 20, 8, 64, 35, 65 }, /* 117 Mb */ |
| 244 | [35] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS_HGI, 130000, | 244 | [35] = { RC_INVALID, WLAN_RC_PHY_HT_20_TS_HGI, 130000, |
| 245 | 115800, 20, 20, 8, 32, 64, 35, 65 }, /* 130 Mb */ | 245 | 115800, 20, 20, 8, 64, 35, 65 }, /* 130 Mb */ |
| 246 | [36] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 156000, | 246 | [36] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 156000, |
| 247 | 137200, 21, 21, 8, 33, 66, 37, 67 }, /* 156 Mb */ | 247 | 137200, 21, 21, 8, 66, 37, 67 }, /* 156 Mb */ |
| 248 | [37] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 173300, | 248 | [37] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 173300, |
| 249 | 151100, 21, 21, 8, 33, 66, 37, 67 }, /* 173.3 Mb */ | 249 | 151100, 21, 21, 8, 66, 37, 67 }, /* 173.3 Mb */ |
| 250 | [38] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 175500, | 250 | [38] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 175500, |
| 251 | 152800, 22, 22, 8, 34, 68, 39, 69 }, /* 175.5 Mb */ | 251 | 152800, 22, 22, 8, 68, 39, 69 }, /* 175.5 Mb */ |
| 252 | [39] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 195000, | 252 | [39] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 195000, |
| 253 | 168400, 22, 22, 8, 34, 68, 39, 69 }, /* 195 Mb */ | 253 | 168400, 22, 22, 8, 68, 39, 69 }, /* 195 Mb */ |
| 254 | [40] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 195000, | 254 | [40] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS, 195000, |
| 255 | 168400, 23, 23, 8, 35, 70, 41, 71 }, /* 195 Mb */ | 255 | 168400, 23, 23, 8, 70, 41, 71 }, /* 195 Mb */ |
| 256 | [41] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 216700, | 256 | [41] = { RC_HT_T_20, WLAN_RC_PHY_HT_20_TS_HGI, 216700, |
| 257 | 185000, 23, 23, 8, 35, 70, 41, 71 }, /* 216.7 Mb */ | 257 | 185000, 23, 23, 8, 70, 41, 71 }, /* 216.7 Mb */ |
| 258 | [42] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 13500, | 258 | [42] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 13500, |
| 259 | 13200, 0, 0, 8, 12, 42, 42, 42 }, /* 13.5 Mb */ | 259 | 13200, 0, 0, 8, 42, 42, 42 }, /* 13.5 Mb */ |
| 260 | [43] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 27500, | 260 | [43] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 27500, |
| 261 | 25900, 1, 1, 8, 13, 43, 43, 43 }, /* 27.0 Mb */ | 261 | 25900, 1, 1, 8, 43, 43, 43 }, /* 27.0 Mb */ |
| 262 | [44] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 40500, | 262 | [44] = { RC_HT_SDT_40, WLAN_RC_PHY_HT_40_SS, 40500, |
| 263 | 38600, 2, 2, 8, 14, 44, 44, 44 }, /* 40.5 Mb */ | 263 | 38600, 2, 2, 8, 44, 44, 44 }, /* 40.5 Mb */ |
| 264 | [45] = { RC_HT_SD_40, WLAN_RC_PHY_HT_40_SS, 54000, | 264 | [45] = { RC_HT_SD_40, WLAN_RC_PHY_HT_40_SS, 54000, |
| 265 | 49800, 3, 3, 8, 15, 45, 45, 45 }, /* 54 Mb */ | 265 | 49800, 3, 3, 8, 45, 45, 45 }, /* 54 Mb */ |
| 266 | [46] = { RC_HT_SD_40, WLAN_RC_PHY_HT_40_SS, 81500, | 266 | [46] = { RC_HT_SD_40, WLAN_RC_PHY_HT_40_SS, 81500, |
| 267 | 72200, 4, 4, 8, 16, 46, 46, 46 }, /* 81 Mb */ | 267 | 72200, 4, 4, 8, 46, 46, 46 }, /* 81 Mb */ |
| 268 | [47] = { RC_HT_S_40 , WLAN_RC_PHY_HT_40_SS, 108000, | 268 | [47] = { RC_HT_S_40 , WLAN_RC_PHY_HT_40_SS, 108000, |
| 269 | 92900, 5, 5, 8, 17, 47, 47, 47 }, /* 108 Mb */ | 269 | 92900, 5, 5, 8, 47, 47, 47 }, /* 108 Mb */ |
| 270 | [48] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 121500, | 270 | [48] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 121500, |
| 271 | 102700, 6, 6, 8, 18, 48, 48, 48 }, /* 121.5 Mb */ | 271 | 102700, 6, 6, 8, 48, 48, 48 }, /* 121.5 Mb */ |
| 272 | [49] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 135000, | 272 | [49] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS, 135000, |
| 273 | 112000, 7, 7, 8, 19, 49, 50, 50 }, /* 135 Mb */ | 273 | 112000, 7, 7, 8, 49, 50, 50 }, /* 135 Mb */ |
| 274 | [50] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS_HGI, 150000, | 274 | [50] = { RC_HT_S_40, WLAN_RC_PHY_HT_40_SS_HGI, 150000, |
| 275 | 122000, 7, 7, 8, 19, 49, 50, 50 }, /* 150 Mb */ | 275 | 122000, 7, 7, 8, 49, 50, 50 }, /* 150 Mb */ |
| 276 | [51] = { RC_INVALID, WLAN_RC_PHY_HT_40_DS, 27000, | 276 | [51] = { RC_INVALID, WLAN_RC_PHY_HT_40_DS, 27000, |
| 277 | 25800, 8, 8, 8, 20, 51, 51, 51 }, /* 27 Mb */ | 277 | 25800, 8, 8, 8, 51, 51, 51 }, /* 27 Mb */ |
| 278 | [52] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_DS, 54000, | 278 | [52] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_DS, 54000, |
| 279 | 49800, 9, 9, 8, 21, 52, 52, 52 }, /* 54 Mb */ | 279 | 49800, 9, 9, 8, 52, 52, 52 }, /* 54 Mb */ |
| 280 | [53] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_DS, 81000, | 280 | [53] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_DS, 81000, |
| 281 | 71900, 10, 10, 8, 22, 53, 53, 53 }, /* 81 Mb */ | 281 | 71900, 10, 10, 8, 53, 53, 53 }, /* 81 Mb */ |
| 282 | [54] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 108000, | 282 | [54] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 108000, |
| 283 | 92500, 11, 11, 8, 23, 54, 54, 54 }, /* 108 Mb */ | 283 | 92500, 11, 11, 8, 54, 54, 54 }, /* 108 Mb */ |
| 284 | [55] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 162000, | 284 | [55] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 162000, |
| 285 | 130300, 12, 12, 8, 24, 55, 55, 55 }, /* 162 Mb */ | 285 | 130300, 12, 12, 8, 55, 55, 55 }, /* 162 Mb */ |
| 286 | [56] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 216000, | 286 | [56] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 216000, |
| 287 | 162800, 13, 13, 8, 25, 56, 56, 56 }, /* 216 Mb */ | 287 | 162800, 13, 13, 8, 56, 56, 56 }, /* 216 Mb */ |
| 288 | [57] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 243000, | 288 | [57] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 243000, |
| 289 | 178200, 14, 14, 8, 26, 57, 57, 57 }, /* 243 Mb */ | 289 | 178200, 14, 14, 8, 57, 57, 57 }, /* 243 Mb */ |
| 290 | [58] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 270000, | 290 | [58] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS, 270000, |
| 291 | 192100, 15, 15, 8, 27, 58, 59, 59 }, /* 270 Mb */ | 291 | 192100, 15, 15, 8, 58, 59, 59 }, /* 270 Mb */ |
| 292 | [59] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS_HGI, 300000, | 292 | [59] = { RC_HT_DT_40, WLAN_RC_PHY_HT_40_DS_HGI, 300000, |
| 293 | 207000, 15, 15, 8, 27, 58, 59, 59 }, /* 300 Mb */ | 293 | 207000, 15, 15, 8, 58, 59, 59 }, /* 300 Mb */ |
| 294 | [60] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 40500, | 294 | [60] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 40500, |
| 295 | 36100, 16, 16, 8, 28, 60, 60, 60 }, /* 40.5 Mb */ | 295 | 36100, 16, 16, 8, 60, 60, 60 }, /* 40.5 Mb */ |
| 296 | [61] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 81000, | 296 | [61] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 81000, |
| 297 | 72900, 17, 17, 8, 29, 61, 61, 61 }, /* 81 Mb */ | 297 | 72900, 17, 17, 8, 61, 61, 61 }, /* 81 Mb */ |
| 298 | [62] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 121500, | 298 | [62] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 121500, |
| 299 | 108300, 18, 18, 8, 30, 62, 62, 62 }, /* 121.5 Mb */ | 299 | 108300, 18, 18, 8, 62, 62, 62 }, /* 121.5 Mb */ |
| 300 | [63] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 162000, | 300 | [63] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 162000, |
| 301 | 142000, 19, 19, 8, 31, 63, 63, 63 }, /* 162 Mb */ | 301 | 142000, 19, 19, 8, 63, 63, 63 }, /* 162 Mb */ |
| 302 | [64] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 243000, | 302 | [64] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS, 243000, |
| 303 | 205100, 20, 20, 8, 32, 64, 65, 65 }, /* 243 Mb */ | 303 | 205100, 20, 20, 8, 64, 65, 65 }, /* 243 Mb */ |
| 304 | [65] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS_HGI, 270000, | 304 | [65] = { RC_INVALID, WLAN_RC_PHY_HT_40_TS_HGI, 270000, |
| 305 | 224700, 20, 20, 8, 32, 64, 65, 65 }, /* 170 Mb */ | 305 | 224700, 20, 20, 8, 64, 65, 65 }, /* 170 Mb */ |
| 306 | [66] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 324000, | 306 | [66] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 324000, |
| 307 | 263100, 21, 21, 8, 33, 66, 67, 67 }, /* 324 Mb */ | 307 | 263100, 21, 21, 8, 66, 67, 67 }, /* 324 Mb */ |
| 308 | [67] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 360000, | 308 | [67] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 360000, |
| 309 | 288000, 21, 21, 8, 33, 66, 67, 67 }, /* 360 Mb */ | 309 | 288000, 21, 21, 8, 66, 67, 67 }, /* 360 Mb */ |
| 310 | [68] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 364500, | 310 | [68] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 364500, |
| 311 | 290700, 22, 22, 8, 34, 68, 69, 69 }, /* 364.5 Mb */ | 311 | 290700, 22, 22, 8, 68, 69, 69 }, /* 364.5 Mb */ |
| 312 | [69] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 405000, | 312 | [69] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 405000, |
| 313 | 317200, 22, 22, 8, 34, 68, 69, 69 }, /* 405 Mb */ | 313 | 317200, 22, 22, 8, 68, 69, 69 }, /* 405 Mb */ |
| 314 | [70] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 405000, | 314 | [70] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS, 405000, |
| 315 | 317200, 23, 23, 8, 35, 70, 71, 71 }, /* 405 Mb */ | 315 | 317200, 23, 23, 8, 70, 71, 71 }, /* 405 Mb */ |
| 316 | [71] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 450000, | 316 | [71] = { RC_HT_T_40, WLAN_RC_PHY_HT_40_TS_HGI, 450000, |
| 317 | 346400, 23, 23, 8, 35, 70, 71, 71 }, /* 450 Mb */ | 317 | 346400, 23, 23, 8, 70, 71, 71 }, /* 450 Mb */ |
| 318 | }, | 318 | }, |
| 319 | 50, /* probe interval */ | 319 | 50, /* probe interval */ |
| 320 | WLAN_RC_HT_FLAG, /* Phy rates allowed initially */ | 320 | WLAN_RC_HT_FLAG, /* Phy rates allowed initially */ |
| @@ -325,21 +325,21 @@ static const struct ath_rate_table ar5416_11a_ratetable = { | |||
| 325 | 0, | 325 | 0, |
| 326 | { | 326 | { |
| 327 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */ | 327 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */ |
| 328 | 5400, 0, 12, 0, 0, 0 }, | 328 | 5400, 0, 12, 0}, |
| 329 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */ | 329 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */ |
| 330 | 7800, 1, 18, 0, 1, 0 }, | 330 | 7800, 1, 18, 0}, |
| 331 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */ | 331 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */ |
| 332 | 10000, 2, 24, 2, 2, 0 }, | 332 | 10000, 2, 24, 2}, |
| 333 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */ | 333 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */ |
| 334 | 13900, 3, 36, 2, 3, 0 }, | 334 | 13900, 3, 36, 2}, |
| 335 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */ | 335 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */ |
| 336 | 17300, 4, 48, 4, 4, 0 }, | 336 | 17300, 4, 48, 4}, |
| 337 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */ | 337 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */ |
| 338 | 23000, 5, 72, 4, 5, 0 }, | 338 | 23000, 5, 72, 4}, |
| 339 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */ | 339 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */ |
| 340 | 27400, 6, 96, 4, 6, 0 }, | 340 | 27400, 6, 96, 4}, |
| 341 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */ | 341 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */ |
| 342 | 29300, 7, 108, 4, 7, 0 }, | 342 | 29300, 7, 108, 4}, |
| 343 | }, | 343 | }, |
| 344 | 50, /* probe interval */ | 344 | 50, /* probe interval */ |
| 345 | 0, /* Phy rates allowed initially */ | 345 | 0, /* Phy rates allowed initially */ |
| @@ -350,29 +350,29 @@ static const struct ath_rate_table ar5416_11g_ratetable = { | |||
| 350 | 0, | 350 | 0, |
| 351 | { | 351 | { |
| 352 | { RC_L_SDT, WLAN_RC_PHY_CCK, 1000, /* 1 Mb */ | 352 | { RC_L_SDT, WLAN_RC_PHY_CCK, 1000, /* 1 Mb */ |
| 353 | 900, 0, 2, 0, 0, 0 }, | 353 | 900, 0, 2, 0}, |
| 354 | { RC_L_SDT, WLAN_RC_PHY_CCK, 2000, /* 2 Mb */ | 354 | { RC_L_SDT, WLAN_RC_PHY_CCK, 2000, /* 2 Mb */ |
| 355 | 1900, 1, 4, 1, 1, 0 }, | 355 | 1900, 1, 4, 1}, |
| 356 | { RC_L_SDT, WLAN_RC_PHY_CCK, 5500, /* 5.5 Mb */ | 356 | { RC_L_SDT, WLAN_RC_PHY_CCK, 5500, /* 5.5 Mb */ |
| 357 | 4900, 2, 11, 2, 2, 0 }, | 357 | 4900, 2, 11, 2}, |
| 358 | { RC_L_SDT, WLAN_RC_PHY_CCK, 11000, /* 11 Mb */ | 358 | { RC_L_SDT, WLAN_RC_PHY_CCK, 11000, /* 11 Mb */ |
| 359 | 8100, 3, 22, 3, 3, 0 }, | 359 | 8100, 3, 22, 3}, |
| 360 | { RC_INVALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */ | 360 | { RC_INVALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */ |
| 361 | 5400, 4, 12, 4, 4, 0 }, | 361 | 5400, 4, 12, 4}, |
| 362 | { RC_INVALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */ | 362 | { RC_INVALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */ |
| 363 | 7800, 5, 18, 4, 5, 0 }, | 363 | 7800, 5, 18, 4}, |
| 364 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */ | 364 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */ |
| 365 | 10000, 6, 24, 6, 6, 0 }, | 365 | 10000, 6, 24, 6}, |
| 366 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */ | 366 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */ |
| 367 | 13900, 7, 36, 6, 7, 0 }, | 367 | 13900, 7, 36, 6}, |
| 368 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */ | 368 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */ |
| 369 | 17300, 8, 48, 8, 8, 0 }, | 369 | 17300, 8, 48, 8}, |
| 370 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */ | 370 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */ |
| 371 | 23000, 9, 72, 8, 9, 0 }, | 371 | 23000, 9, 72, 8}, |
| 372 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */ | 372 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */ |
| 373 | 27400, 10, 96, 8, 10, 0 }, | 373 | 27400, 10, 96, 8}, |
| 374 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */ | 374 | { RC_L_SDT, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */ |
| 375 | 29300, 11, 108, 8, 11, 0 }, | 375 | 29300, 11, 108, 8}, |
| 376 | }, | 376 | }, |
| 377 | 50, /* probe interval */ | 377 | 50, /* probe interval */ |
| 378 | 0, /* Phy rates allowed initially */ | 378 | 0, /* Phy rates allowed initially */ |
diff --git a/drivers/net/wireless/ath/ath9k/rc.h b/drivers/net/wireless/ath/ath9k/rc.h index e914c334c65e..dc1082654501 100644 --- a/drivers/net/wireless/ath/ath9k/rc.h +++ b/drivers/net/wireless/ath/ath9k/rc.h | |||
| @@ -162,7 +162,6 @@ struct ath_rate_table { | |||
| 162 | u8 ratecode; | 162 | u8 ratecode; |
| 163 | u8 dot11rate; | 163 | u8 dot11rate; |
| 164 | u8 ctrl_rate; | 164 | u8 ctrl_rate; |
| 165 | u8 base_index; | ||
| 166 | u8 cw40index; | 165 | u8 cw40index; |
| 167 | u8 sgi_index; | 166 | u8 sgi_index; |
| 168 | u8 ht_index; | 167 | u8 ht_index; |