projects / openwrt / svn-archive / archive.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
ath9k: fix bisectability of rc patches
[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 561-ath9k_rc_table_cleanup.patch
1 --- a/drivers/net/wireless/ath/ath9k/rc.h
2 +++ b/drivers/net/wireless/ath/ath9k/rc.h
3 @@ -112,14 +112,12 @@ struct ath_rate_table {
4 u32 ratekbps;
5 u32 user_ratekbps;
6 u8 ratecode;
7 - u8 short_preamble;
8 u8 dot11rate;
9 u8 ctrl_rate;
10 u8 base_index;
11 u8 cw40index;
12 u8 sgi_index;
13 u8 ht_index;
14 - u32 max_4ms_framelen;
15 } info[RATE_TABLE_SIZE];
16 u32 probe_interval;
17 u8 initial_ratemax;
18 --- a/drivers/net/wireless/ath/ath9k/rc.c
19 +++ b/drivers/net/wireless/ath/ath9k/rc.c
20 @@ -22,131 +22,89 @@ static const struct ath_rate_table ar541
21 8, /* MCS start */
22 {
23 { VALID, VALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
24 - 5400, 0, 0x00, 12,
25 - 0, 0, 0, 0, 0, 0 },
26 + 5400, 0, 12, 0, 0, 0, 0, 0 },
27 { VALID, VALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
28 - 7800, 1, 0x00, 18,
29 - 0, 1, 1, 1, 1, 0 },
30 + 7800, 1, 18, 0, 1, 1, 1, 1 },
31 { VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
32 - 10000, 2, 0x00, 24,
33 - 2, 2, 2, 2, 2, 0 },
34 + 10000, 2, 24, 2, 2, 2, 2, 2 },
35 { VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
36 - 13900, 3, 0x00, 36,
37 - 2, 3, 3, 3, 3, 0 },
38 + 13900, 3, 36, 2, 3, 3, 3, 3 },
39 { VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
40 - 17300, 4, 0x00, 48,
41 - 4, 4, 4, 4, 4, 0 },
42 + 17300, 4, 48, 4, 4, 4, 4, 4 },
43 { VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
44 - 23000, 5, 0x00, 72,
45 - 4, 5, 5, 5, 5, 0 },
46 + 23000, 5, 72, 4, 5, 5, 5, 5 },
47 { VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
48 - 27400, 6, 0x00, 96,
49 - 4, 6, 6, 6, 6, 0 },
50 + 27400, 6, 96, 4, 6, 6, 6, 6 },
51 { VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
52 - 29300, 7, 0x00, 108,
53 - 4, 7, 7, 7, 7, 0 },
54 + 29300, 7, 108, 4, 7, 7, 7, 7 },
55 { VALID_2040, VALID_2040, WLAN_RC_PHY_HT_20_SS, 6500, /* 6.5 Mb */
56 - 6400, 0, 0x00, 0,
57 - 0, 8, 24, 8, 24, 3216 },
58 + 6400, 0, 0, 0, 8, 24, 8, 24 },
59 { VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 13000, /* 13 Mb */
60 - 12700, 1, 0x00, 1,
61 - 2, 9, 25, 9, 25, 6434 },
62 + 12700, 1, 1, 2, 9, 25, 9, 25 },
63 { VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 19500, /* 19.5 Mb */
64 - 18800, 2, 0x00, 2,
65 - 2, 10, 26, 10, 26, 9650 },
66 + 18800, 2, 2, 2, 10, 26, 10, 26 },
67 { VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 26000, /* 26 Mb */
68 - 25000, 3, 0x00, 3,
69 - 4, 11, 27, 11, 27, 12868 },
70 + 25000, 3, 3, 4, 11, 27, 11, 27 },
71 { VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 39000, /* 39 Mb */
72 - 36700, 4, 0x00, 4,
73 - 4, 12, 28, 12, 28, 19304 },
74 + 36700, 4, 4, 4, 12, 28, 12, 28 },
75 { INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 52000, /* 52 Mb */
76 - 48100, 5, 0x00, 5,
77 - 4, 13, 29, 13, 29, 25740 },
78 + 48100, 5, 5, 4, 13, 29, 13, 29 },
79 { INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 58500, /* 58.5 Mb */
80 - 53500, 6, 0x00, 6,
81 - 4, 14, 30, 14, 30, 28956 },
82 + 53500, 6, 6, 4, 14, 30, 14, 30 },
83 { INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 65000, /* 65 Mb */
84 - 59000, 7, 0x00, 7,
85 - 4, 15, 31, 15, 32, 32180 },
86 + 59000, 7, 7, 4, 15, 31, 15, 32 },
87 { INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 13000, /* 13 Mb */
88 - 12700, 8, 0x00,
89 - 8, 3, 16, 33, 16, 33, 6430 },
90 + 12700, 8, 8, 3, 16, 33, 16, 33 },
91 { INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 26000, /* 26 Mb */
92 - 24800, 9, 0x00, 9,
93 - 2, 17, 34, 17, 34, 12860 },
94 + 24800, 9, 9, 2, 17, 34, 17, 34 },
95 { INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 39000, /* 39 Mb */
96 - 36600, 10, 0x00, 10,
97 - 2, 18, 35, 18, 35, 19300 },
98 + 36600, 10, 10, 2, 18, 35, 18, 35 },
99 { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 52000, /* 52 Mb */
100 - 48100, 11, 0x00, 11,
101 - 4, 19, 36, 19, 36, 25736 },
102 + 48100, 11, 11, 4, 19, 36, 19, 36 },
103 { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 78000, /* 78 Mb */
104 - 69500, 12, 0x00, 12,
105 - 4, 20, 37, 20, 37, 38600 },
106 + 69500, 12, 12, 4, 20, 37, 20, 37 },
107 { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 104000, /* 104 Mb */
108 - 89500, 13, 0x00, 13,
109 - 4, 21, 38, 21, 38, 51472 },
110 + 89500, 13, 13, 4, 21, 38, 21, 38 },
111 { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 117000, /* 117 Mb */
112 - 98900, 14, 0x00, 14,
113 - 4, 22, 39, 22, 39, 57890 },
114 + 98900, 14, 14, 4, 22, 39, 22, 39 },
115 { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 130000, /* 130 Mb */
116 - 108300, 15, 0x00, 15,
117 - 4, 23, 40, 23, 41, 64320 },
118 + 108300, 15, 15, 4, 23, 40, 23, 41 },
119 { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 13500, /* 13.5 Mb */
120 - 13200, 0, 0x00, 0,
121 - 0, 8, 24, 24, 24, 6684 },
122 + 13200, 0, 0, 0, 8, 24, 24, 24 },
123 { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 27500, /* 27.0 Mb */
124 - 25900, 1, 0x00, 1,
125 - 2, 9, 25, 25, 25, 13368 },
126 + 25900, 1, 1, 2, 9, 25, 25, 25 },
127 { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 40500, /* 40.5 Mb */
128 - 38600, 2, 0x00, 2,
129 - 2, 10, 26, 26, 26, 20052 },
130 + 38600, 2, 2, 2, 10, 26, 26, 26 },
131 { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 54000, /* 54 Mb */
132 - 49800, 3, 0x00, 3,
133 - 4, 11, 27, 27, 27, 26738 },
134 + 49800, 3, 3, 4, 11, 27, 27, 27 },
135 { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 81500, /* 81 Mb */
136 - 72200, 4, 0x00, 4,
137 - 4, 12, 28, 28, 28, 40104 },
138 + 72200, 4, 4, 4, 12, 28, 28, 28 },
139 { INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 108000, /* 108 Mb */
140 - 92900, 5, 0x00, 5,
141 - 4, 13, 29, 29, 29, 53476 },
142 + 92900, 5, 5, 4, 13, 29, 29, 29 },
143 { INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 121500, /* 121.5 Mb */
144 - 102700, 6, 0x00, 6,
145 - 4, 14, 30, 30, 30, 60156 },
146 + 102700, 6, 6, 4, 14, 30, 30, 30 },
147 { INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 135000, /* 135 Mb */
148 - 112000, 7, 0x00, 7,
149 - 4, 15, 31, 32, 32, 66840 },
150 + 112000, 7, 7, 4, 15, 31, 32, 32 },
151 { INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS_HGI, 150000, /* 150 Mb */
152 - 122000, 7, 0x00, 7,
153 - 4, 15, 31, 32, 32, 74200 },
154 + 122000, 7, 7, 4, 15, 31, 32, 32 },
155 { INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 27000, /* 27 Mb */
156 - 25800, 8, 0x00, 8,
157 - 0, 16, 33, 33, 33, 13360 },
158 + 25800, 8, 8, 0, 16, 33, 33, 33 },
159 { INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 54000, /* 54 Mb */
160 - 49800, 9, 0x00, 9,
161 - 2, 17, 34, 34, 34, 26720 },
162 + 49800, 9, 9, 2, 17, 34, 34, 34 },
163 { INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 81000, /* 81 Mb */
164 - 71900, 10, 0x00, 10,
165 - 2, 18, 35, 35, 35, 40080 },
166 + 71900, 10, 10, 2, 18, 35, 35, 35 },
167 { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 108000, /* 108 Mb */
168 - 92500, 11, 0x00, 11,
169 - 4, 19, 36, 36, 36, 53440 },
170 + 92500, 11, 11, 4, 19, 36, 36, 36 },
171 { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 162000, /* 162 Mb */
172 - 130300, 12, 0x00, 12,
173 - 4, 20, 37, 37, 37, 80160 },
174 + 130300, 12, 12, 4, 20, 37, 37, 37 },
175 { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 216000, /* 216 Mb */
176 - 162800, 13, 0x00, 13,
177 - 4, 21, 38, 38, 38, 106880 },
178 + 162800, 13, 13, 4, 21, 38, 38, 38 },
179 { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 243000, /* 243 Mb */
180 - 178200, 14, 0x00, 14,
181 - 4, 22, 39, 39, 39, 120240 },
182 + 178200, 14, 14, 4, 22, 39, 39, 39 },
183 { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 270000, /* 270 Mb */
184 - 192100, 15, 0x00, 15,
185 - 4, 23, 40, 41, 41, 133600 },
186 + 192100, 15, 15, 4, 23, 40, 41, 41 },
187 { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS_HGI, 300000, /* 300 Mb */
188 - 207000, 15, 0x00, 15,
189 - 4, 23, 40, 41, 41, 148400 },
190 + 207000, 15, 15, 4, 23, 40, 41, 41 },
191 },
192 50, /* probe interval */
193 WLAN_RC_HT_FLAG, /* Phy rates allowed initially */
194 @@ -160,144 +118,98 @@ static const struct ath_rate_table ar541
195 12, /* MCS start */
196 {
197 { VALID_ALL, VALID_ALL, WLAN_RC_PHY_CCK, 1000, /* 1 Mb */
198 - 900, 0, 0x00, 2,
199 - 0, 0, 0, 0, 0, 0 },
200 + 900, 0, 2, 0, 0, 0, 0, 0 },
201 { VALID_ALL, VALID_ALL, WLAN_RC_PHY_CCK, 2000, /* 2 Mb */
202 - 1900, 1, 0x04, 4,
203 - 1, 1, 1, 1, 1, 0 },
204 + 1900, 1, 4, 1, 1, 1, 1, 1 },
205 { VALID_ALL, VALID_ALL, WLAN_RC_PHY_CCK, 5500, /* 5.5 Mb */
206 - 4900, 2, 0x04, 11,
207 - 2, 2, 2, 2, 2, 0 },
208 + 4900, 2, 11, 2, 2, 2, 2, 2 },
209 { VALID_ALL, VALID_ALL, WLAN_RC_PHY_CCK, 11000, /* 11 Mb */
210 - 8100, 3, 0x04, 22,
211 - 3, 3, 3, 3, 3, 0 },
212 + 8100, 3, 22, 3, 3, 3, 3, 3 },
213 { INVALID, INVALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
214 - 5400, 4, 0x00, 12,
215 - 4, 4, 4, 4, 4, 0 },
216 + 5400, 4, 12, 4, 4, 4, 4, 4 },
217 { INVALID, INVALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
218 - 7800, 5, 0x00, 18,
219 - 4, 5, 5, 5, 5, 0 },
220 + 7800, 5, 18, 4, 5, 5, 5, 5 },
221 { VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
222 - 10100, 6, 0x00, 24,
223 - 6, 6, 6, 6, 6, 0 },
224 + 10100, 6, 24, 6, 6, 6, 6, 6 },
225 { VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
226 - 14100, 7, 0x00, 36,
227 - 6, 7, 7, 7, 7, 0 },
228 + 14100, 7, 36, 6, 7, 7, 7, 7 },
229 { VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
230 - 17700, 8, 0x00, 48,
231 - 8, 8, 8, 8, 8, 0 },
232 + 17700, 8, 48, 8, 8, 8, 8, 8 },
233 { VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
234 - 23700, 9, 0x00, 72,
235 - 8, 9, 9, 9, 9, 0 },
236 + 23700, 9, 72, 8, 9, 9, 9, 9 },
237 { VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
238 - 27400, 10, 0x00, 96,
239 - 8, 10, 10, 10, 10, 0 },
240 + 27400, 10, 96, 8, 10, 10, 10, 10 },
241 { VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
242 - 30900, 11, 0x00, 108,
243 - 8, 11, 11, 11, 11, 0 },
244 + 30900, 11, 108, 8, 11, 11, 11, 11 },
245 { INVALID, INVALID, WLAN_RC_PHY_HT_20_SS, 6500, /* 6.5 Mb */
246 - 6400, 0, 0x00, 0,
247 - 4, 12, 28, 12, 28, 3216 },
248 + 6400, 0, 0, 4, 12, 28, 12, 28 },
249 { VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 13000, /* 13 Mb */
250 - 12700, 1, 0x00, 1,
251 - 6, 13, 29, 13, 29, 6434 },
252 + 12700, 1, 1, 6, 13, 29, 13, 29 },
253 { VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 19500, /* 19.5 Mb */
254 - 18800, 2, 0x00, 2,
255 - 6, 14, 30, 14, 30, 9650 },
256 + 18800, 2, 2, 6, 14, 30, 14, 30 },
257 { VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 26000, /* 26 Mb */
258 - 25000, 3, 0x00, 3,
259 - 8, 15, 31, 15, 31, 12868 },
260 + 25000, 3, 3, 8, 15, 31, 15, 31 },
261 { VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 39000, /* 39 Mb */
262 - 36700, 4, 0x00, 4,
263 - 8, 16, 32, 16, 32, 19304 },
264 + 36700, 4, 4, 8, 16, 32, 16, 32 },
265 { INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 52000, /* 52 Mb */
266 - 48100, 5, 0x00, 5,
267 - 8, 17, 33, 17, 33, 25740 },
268 + 48100, 5, 5, 8, 17, 33, 17, 33 },
269 { INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 58500, /* 58.5 Mb */
270 - 53500, 6, 0x00, 6,
271 - 8, 18, 34, 18, 34, 28956 },
272 + 53500, 6, 6, 8, 18, 34, 18, 34 },
273 { INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 65000, /* 65 Mb */
274 - 59000, 7, 0x00, 7,
275 - 8, 19, 35, 19, 36, 32180 },
276 + 59000, 7, 7, 8, 19, 35, 19, 36 },
277 { INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 13000, /* 13 Mb */
278 - 12700, 8, 0x00, 8,
279 - 4, 20, 37, 20, 37, 6430 },
280 + 12700, 8, 8, 4, 20, 37, 20, 37 },
281 { INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 26000, /* 26 Mb */
282 - 24800, 9, 0x00, 9,
283 - 6, 21, 38, 21, 38, 12860 },
284 + 24800, 9, 9, 6, 21, 38, 21, 38 },
285 { INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 39000, /* 39 Mb */
286 - 36600, 10, 0x00, 10,
287 - 6, 22, 39, 22, 39, 19300 },
288 + 36600, 10, 10, 6, 22, 39, 22, 39 },
289 { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 52000, /* 52 Mb */
290 - 48100, 11, 0x00, 11,
291 - 8, 23, 40, 23, 40, 25736 },
292 + 48100, 11, 11, 8, 23, 40, 23, 40 },
293 { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 78000, /* 78 Mb */
294 - 69500, 12, 0x00, 12,
295 - 8, 24, 41, 24, 41, 38600 },
296 + 69500, 12, 12, 8, 24, 41, 24, 41 },
297 { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 104000, /* 104 Mb */
298 - 89500, 13, 0x00, 13,
299 - 8, 25, 42, 25, 42, 51472 },
300 + 89500, 13, 13, 8, 25, 42, 25, 42 },
301 { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 117000, /* 117 Mb */
302 - 98900, 14, 0x00, 14,
303 - 8, 26, 43, 26, 44, 57890 },
304 + 98900, 14, 14, 8, 26, 43, 26, 44 },
305 { VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 130000, /* 130 Mb */
306 - 108300, 15, 0x00, 15,
307 - 8, 27, 44, 27, 45, 64320 },
308 + 108300, 15, 15, 8, 27, 44, 27, 45 },
309 { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 13500, /* 13.5 Mb */
310 - 13200, 0, 0x00, 0,
311 - 8, 12, 28, 28, 28, 6684 },
312 + 13200, 0, 0, 8, 12, 28, 28, 28 },
313 { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 27500, /* 27.0 Mb */
314 - 25900, 1, 0x00, 1,
315 - 8, 13, 29, 29, 29, 13368 },
316 + 25900, 1, 1, 8, 13, 29, 29, 29 },
317 { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 40500, /* 40.5 Mb */
318 - 38600, 2, 0x00, 2,
319 - 8, 14, 30, 30, 30, 20052 },
320 + 38600, 2, 2, 8, 14, 30, 30, 30 },
321 { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 54000, /* 54 Mb */
322 - 49800, 3, 0x00, 3,
323 - 8, 15, 31, 31, 31, 26738 },
324 + 49800, 3, 3, 8, 15, 31, 31, 31 },
325 { VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 81500, /* 81 Mb */
326 - 72200, 4, 0x00, 4,
327 - 8, 16, 32, 32, 32, 40104 },
328 + 72200, 4, 4, 8, 16, 32, 32, 32 },
329 { INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 108000, /* 108 Mb */
330 - 92900, 5, 0x00, 5,
331 - 8, 17, 33, 33, 33, 53476 },
332 + 92900, 5, 5, 8, 17, 33, 33, 33 },
333 { INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 121500, /* 121.5 Mb */
334 - 102700, 6, 0x00, 6,
335 - 8, 18, 34, 34, 34, 60156 },
336 + 102700, 6, 6, 8, 18, 34, 34, 34 },
337 { INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 135000, /* 135 Mb */
338 - 112000, 7, 0x00, 7,
339 - 8, 19, 35, 36, 36, 66840 },
340 + 112000, 7, 7, 8, 19, 35, 36, 36 },
341 { INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS_HGI, 150000, /* 150 Mb */
342 - 122000, 7, 0x00, 7,
343 - 8, 19, 35, 36, 36, 74200 },
344 + 122000, 7, 7, 8, 19, 35, 36, 36 },
345 { INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 27000, /* 27 Mb */
346 - 25800, 8, 0x00, 8,
347 - 8, 20, 37, 37, 37, 13360 },
348 + 25800, 8, 8, 8, 20, 37, 37, 37 },
349 { INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 54000, /* 54 Mb */
350 - 49800, 9, 0x00, 9,
351 - 8, 21, 38, 38, 38, 26720 },
352 + 49800, 9, 9, 8, 21, 38, 38, 38 },
353 { INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 81000, /* 81 Mb */
354 - 71900, 10, 0x00, 10,
355 - 8, 22, 39, 39, 39, 40080 },
356 + 71900, 10, 10, 8, 22, 39, 39, 39 },
357 { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 108000, /* 108 Mb */
358 - 92500, 11, 0x00, 11,
359 - 8, 23, 40, 40, 40, 53440 },
360 + 92500, 11, 11, 8, 23, 40, 40, 40 },
361 { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 162000, /* 162 Mb */
362 - 130300, 12, 0x00, 12,
363 - 8, 24, 41, 41, 41, 80160 },
364 + 130300, 12, 12, 8, 24, 41, 41, 41 },
365 { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 216000, /* 216 Mb */
366 - 162800, 13, 0x00, 13,
367 - 8, 25, 42, 42, 42, 106880 },
368 + 162800, 13, 13, 8, 25, 42, 42, 42 },
369 { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 243000, /* 243 Mb */
370 - 178200, 14, 0x00, 14,
371 - 8, 26, 43, 43, 43, 120240 },
372 + 178200, 14, 14, 8, 26, 43, 43, 43 },
373 { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 270000, /* 270 Mb */
374 - 192100, 15, 0x00, 15,
375 - 8, 27, 44, 45, 45, 133600 },
376 + 192100, 15, 15, 8, 27, 44, 45, 45 },
377 { VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS_HGI, 300000, /* 300 Mb */
378 - 207000, 15, 0x00, 15,
379 - 8, 27, 44, 45, 45, 148400 },
380 - },
381 + 207000, 15, 15, 8, 27, 44, 45, 45 },
382 + },
383 50, /* probe interval */
384 WLAN_RC_HT_FLAG, /* Phy rates allowed initially */
385 };
386 @@ -307,29 +219,21 @@ static const struct ath_rate_table ar541
387 0,
388 {
389 { VALID, VALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
390 - 5400, 0, 0x00, 12,
391 - 0, 0, 0 },
392 + 5400, 0, 12, 0, 0, 0 },
393 { VALID, VALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
394 - 7800, 1, 0x00, 18,
395 - 0, 1, 0 },
396 + 7800, 1, 18, 0, 1, 0 },
397 { VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
398 - 10000, 2, 0x00, 24,
399 - 2, 2, 0 },
400 + 10000, 2, 24, 2, 2, 0 },
401 { VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
402 - 13900, 3, 0x00, 36,
403 - 2, 3, 0 },
404 + 13900, 3, 36, 2, 3, 0 },
405 { VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
406 - 17300, 4, 0x00, 48,
407 - 4, 4, 0 },
408 + 17300, 4, 48, 4, 4, 0 },
409 { VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
410 - 23000, 5, 0x00, 72,
411 - 4, 5, 0 },
412 + 23000, 5, 72, 4, 5, 0 },
413 { VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
414 - 27400, 6, 0x00, 96,
415 - 4, 6, 0 },
416 + 27400, 6, 96, 4, 6, 0 },
417 { VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
418 - 29300, 7, 0x00, 108,
419 - 4, 7, 0 },
420 + 29300, 7, 108, 4, 7, 0 },
421 },
422 50, /* probe interval */
423 0, /* Phy rates allowed initially */
424 @@ -340,41 +244,29 @@ static const struct ath_rate_table ar541
425 0,
426 {
427 { VALID, VALID, WLAN_RC_PHY_CCK, 1000, /* 1 Mb */
428 - 900, 0, 0x00, 2,
429 - 0, 0, 0 },
430 + 900, 0, 2, 0, 0, 0 },
431 { VALID, VALID, WLAN_RC_PHY_CCK, 2000, /* 2 Mb */
432 - 1900, 1, 0x04, 4,
433 - 1, 1, 0 },
434 + 1900, 1, 4, 1, 1, 0 },
435 { VALID, VALID, WLAN_RC_PHY_CCK, 5500, /* 5.5 Mb */
436 - 4900, 2, 0x04, 11,
437 - 2, 2, 0 },
438 + 4900, 2, 11, 2, 2, 0 },
439 { VALID, VALID, WLAN_RC_PHY_CCK, 11000, /* 11 Mb */
440 - 8100, 3, 0x04, 22,
441 - 3, 3, 0 },
442 + 8100, 3, 22, 3, 3, 0 },
443 { INVALID, INVALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
444 - 5400, 4, 0x00, 12,
445 - 4, 4, 0 },
446 + 5400, 4, 12, 4, 4, 0 },
447 { INVALID, INVALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
448 - 7800, 5, 0x00, 18,
449 - 4, 5, 0 },
450 + 7800, 5, 18, 4, 5, 0 },
451 { VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
452 - 10000, 6, 0x00, 24,
453 - 6, 6, 0 },
454 + 10000, 6, 24, 6, 6, 0 },
455 { VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
456 - 13900, 7, 0x00, 36,
457 - 6, 7, 0 },
458 + 13900, 7, 36, 6, 7, 0 },
459 { VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
460 - 17300, 8, 0x00, 48,
461 - 8, 8, 0 },
462 + 17300, 8, 48, 8, 8, 0 },
463 { VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
464 - 23000, 9, 0x00, 72,
465 - 8, 9, 0 },
466 + 23000, 9, 72, 8, 9, 0 },
467 { VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
468 - 27400, 10, 0x00, 96,
469 - 8, 10, 0 },
470 + 27400, 10, 96, 8, 10, 0 },
471 { VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
472 - 29300, 11, 0x00, 108,
473 - 8, 11, 0 },
474 + 29300, 11, 108, 8, 11, 0 },
475 },
476 50, /* probe interval */
477 0, /* Phy rates allowed initially */
OpenWrt SVN history