ath9k: split up and adjust rc cleanup patch according to upstream feedback, also fix tx status reporting for minstrel compatibility

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18444 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 539 insertions, 516 deletions

diff --git a/package/mac80211/patches/560-ath9k_rate_control_api.patch b/package/mac80211/patches/560-ath9k_rate_control_api.patch
index 13ada5da0d..5769d305ad 100644
--- a/package/mac80211/patches/560-ath9k_rate_control_api.patch
+++ b/package/mac80211/patches/560-ath9k_rate_control_api.patch
@@ -1,473 +1,38 @@
 --- a/drivers/net/wireless/ath/ath9k/rc.c
 +++ b/drivers/net/wireless/ath/ath9k/rc.c
-@@ -19,133 +19,92 @@
+@@ -19,6 +19,7 @@
  
  static const struct ath_rate_table ar5416_11na_ratetable = {
  	42,
 +	8, /* MCS start */
  	{
  		{ VALID, VALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
--			5400, 0x0b, 0x00, 12,
--			0, 0, 0, 0, 0, 0 },
-+			5400, 0, 12, 0, 0, 0, 0, 0 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
--			7800,  0x0f, 0x00, 18,
--			0, 1, 1, 1, 1, 0 },
-+			7800,  1, 18, 0, 1, 1, 1, 1 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
--			10000, 0x0a, 0x00, 24,
--			2, 2, 2, 2, 2, 0 },
-+			10000, 2, 24, 2, 2, 2, 2, 2 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
--			13900, 0x0e, 0x00, 36,
--			2,  3, 3, 3, 3, 0 },
-+			13900, 3, 36, 2, 3, 3, 3, 3 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
--			17300, 0x09, 0x00, 48,
--			4,  4, 4, 4, 4, 0 },
-+			17300, 4, 48, 4, 4, 4, 4, 4 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
--			23000, 0x0d, 0x00, 72,
--			4,  5, 5, 5, 5, 0 },
-+			23000, 5, 72, 4, 5, 5, 5, 5 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
--			27400, 0x08, 0x00, 96,
--			4,  6, 6, 6, 6, 0 },
-+			27400, 6, 96, 4, 6, 6, 6, 6 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
--			29300, 0x0c, 0x00, 108,
--			4,  7, 7, 7, 7, 0 },
-+			29300, 7, 108, 4, 7, 7, 7, 7 },
- 		{ VALID_2040, VALID_2040, WLAN_RC_PHY_HT_20_SS, 6500, /* 6.5 Mb */
--			6400, 0x80, 0x00, 0,
--			0, 8, 24, 8, 24, 3216 },
-+			6400, 0, 0, 0, 8, 24, 8, 24 },
- 		{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 13000, /* 13 Mb */
--			12700, 0x81, 0x00, 1,
--			2, 9, 25, 9, 25, 6434 },
-+			12700, 1, 1, 2, 9, 25, 9, 25 },
- 		{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 19500, /* 19.5 Mb */
--			18800, 0x82, 0x00, 2,
--			2, 10, 26, 10, 26, 9650 },
-+			18800, 2, 2, 2, 10, 26, 10, 26 },
- 		{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 26000, /* 26 Mb */
--			25000, 0x83, 0x00, 3,
--			4,  11, 27, 11, 27, 12868 },
-+			25000, 3, 3, 4, 11, 27, 11, 27 },
- 		{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 39000, /* 39 Mb */
--			36700, 0x84, 0x00, 4,
--			4,  12, 28, 12, 28, 19304 },
-+			36700, 4, 4, 4, 12, 28, 12, 28 },
- 		{ INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 52000, /* 52 Mb */
--			48100, 0x85, 0x00, 5,
--			4,  13, 29, 13, 29, 25740 },
-+			48100, 5, 5, 4, 13, 29, 13, 29 },
- 		{ INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 58500, /* 58.5 Mb */
--			53500, 0x86, 0x00, 6,
--			4,  14, 30, 14, 30,  28956 },
-+			53500, 6, 6, 4, 14, 30, 14, 30 },
- 		{ INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 65000, /* 65 Mb */
--			59000, 0x87, 0x00, 7,
--			4,  15, 31, 15, 32, 32180 },
-+			59000, 7, 7, 4, 15, 31, 15, 32 },
- 		{ INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 13000, /* 13 Mb */
--			12700, 0x88, 0x00,
--			8, 3, 16, 33, 16, 33, 6430 },
-+			12700, 8, 8, 3, 16, 33, 16, 33 },
- 		{ INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 26000, /* 26 Mb */
--			24800, 0x89, 0x00, 9,
--			2, 17, 34, 17, 34, 12860 },
-+			24800, 9, 9, 2, 17, 34, 17, 34 },
- 		{ INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 39000, /* 39 Mb */
--			36600, 0x8a, 0x00, 10,
--			2, 18, 35, 18, 35, 19300 },
-+			36600, 10, 10, 2, 18, 35, 18, 35 },
- 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 52000, /* 52 Mb */
--			48100, 0x8b, 0x00, 11,
--			4,  19, 36, 19, 36, 25736 },
-+			48100, 11, 11, 4, 19, 36, 19, 36 },
- 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 78000, /* 78 Mb */
--			69500, 0x8c, 0x00, 12,
--			4,  20, 37, 20, 37, 38600 },
-+			69500, 12, 12, 4, 20, 37, 20, 37 },
- 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 104000, /* 104 Mb */
--			89500, 0x8d, 0x00, 13,
--			4,  21, 38, 21, 38, 51472 },
-+			89500, 13, 13, 4, 21, 38, 21, 38 },
- 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 117000, /* 117 Mb */
--			98900, 0x8e, 0x00, 14,
--			4,  22, 39, 22, 39, 57890 },
-+			98900, 14, 14, 4, 22, 39, 22, 39 },
- 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 130000, /* 130 Mb */
--			108300, 0x8f, 0x00, 15,
--			4,  23, 40, 23, 41, 64320 },
-+			108300, 15, 15, 4, 23, 40, 23, 41 },
- 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 13500, /* 13.5 Mb */
--			13200, 0x80, 0x00, 0,
--			0, 8, 24, 24, 24, 6684 },
-+			13200, 0, 0, 0, 8, 24, 24, 24 },
- 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 27500, /* 27.0 Mb */
--			25900, 0x81, 0x00, 1,
--			2, 9, 25, 25, 25, 13368 },
-+			25900, 1, 1, 2, 9, 25, 25, 25 },
- 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 40500, /* 40.5 Mb */
--			38600, 0x82, 0x00, 2,
--			2, 10, 26, 26, 26, 20052 },
-+			38600, 2, 2, 2, 10, 26, 26, 26 },
- 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 54000, /* 54 Mb */
--			49800, 0x83, 0x00, 3,
--			4,  11, 27, 27, 27, 26738 },
-+			49800, 3, 3, 4, 11, 27, 27, 27 },
- 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 81500, /* 81 Mb */
--			72200, 0x84, 0x00, 4,
--			4,  12, 28, 28, 28, 40104 },
-+			72200, 4, 4, 4, 12, 28, 28, 28 },
- 		{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 108000, /* 108 Mb */
--			92900, 0x85, 0x00, 5,
--			4,  13, 29, 29, 29, 53476 },
-+			92900, 5, 5, 4, 13, 29, 29, 29 },
- 		{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 121500, /* 121.5 Mb */
--			102700, 0x86, 0x00, 6,
--			4,  14, 30, 30, 30, 60156 },
-+			102700, 6, 6, 4, 14, 30, 30, 30 },
- 		{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 135000, /* 135 Mb */
--			112000, 0x87, 0x00, 7,
--			4,  15, 31, 32, 32, 66840 },
-+			112000, 7, 7, 4, 15, 31, 32, 32 },
- 		{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS_HGI, 150000, /* 150 Mb */
--			122000, 0x87, 0x00, 7,
--			4,  15, 31, 32, 32, 74200 },
-+			122000, 7, 7, 4, 15, 31, 32, 32 },
- 		{ INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 27000, /* 27 Mb */
--			25800, 0x88, 0x00, 8,
--			0, 16, 33, 33, 33, 13360 },
-+			25800, 8, 8, 0, 16, 33, 33, 33 },
- 		{ INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 54000, /* 54 Mb */
--			49800, 0x89, 0x00, 9,
--			2, 17, 34, 34, 34, 26720 },
-+			49800, 9, 9, 2, 17, 34, 34, 34 },
- 		{ INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 81000, /* 81 Mb */
--			71900, 0x8a, 0x00, 10,
--			2, 18, 35, 35, 35, 40080 },
-+			71900, 10, 10, 2, 18, 35, 35, 35 },
- 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 108000, /* 108 Mb */
--			92500, 0x8b, 0x00, 11,
--			4,  19, 36, 36, 36, 53440 },
-+			92500, 11, 11, 4, 19, 36, 36, 36 },
- 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 162000, /* 162 Mb */
--			130300, 0x8c, 0x00, 12,
--			4,  20, 37, 37, 37, 80160 },
-+			130300, 12, 12, 4, 20, 37, 37, 37 },
- 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 216000, /* 216 Mb */
--			162800, 0x8d, 0x00, 13,
--			4,  21, 38, 38, 38, 106880 },
-+			162800, 13, 13, 4, 21, 38, 38, 38 },
- 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 243000, /* 243 Mb */
--			178200, 0x8e, 0x00, 14,
--			4,  22, 39, 39, 39, 120240 },
-+			178200, 14, 14, 4, 22, 39, 39, 39 },
- 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 270000, /* 270 Mb */
--			192100, 0x8f, 0x00, 15,
--			4,  23, 40, 41, 41, 133600 },
-+			192100, 15, 15, 4, 23, 40, 41, 41 },
- 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS_HGI, 300000, /* 300 Mb */
--			207000, 0x8f, 0x00, 15,
--			4,  23, 40, 41, 41, 148400 },
-+			207000, 15, 15, 4, 23, 40, 41, 41 },
- 	},
- 	50,  /* probe interval */
- 	WLAN_RC_HT_FLAG,  /* Phy rates allowed initially */
-@@ -156,177 +115,125 @@ static const struct ath_rate_table ar541
+ 			5400, 0x0b, 0x00, 12,
+@@ -156,6 +157,7 @@ static const struct ath_rate_table ar541
  
  static const struct ath_rate_table ar5416_11ng_ratetable = {
  	46,
 +	12, /* MCS start */
  	{
  		{ VALID_ALL, VALID_ALL, WLAN_RC_PHY_CCK, 1000, /* 1 Mb */
--			900, 0x1b, 0x00, 2,
--			0, 0, 0, 0, 0, 0 },
-+			900, 0, 2, 0, 0, 0, 0, 0 },
- 		{ VALID_ALL, VALID_ALL, WLAN_RC_PHY_CCK, 2000, /* 2 Mb */
--			1900, 0x1a, 0x04, 4,
--			1, 1, 1, 1, 1, 0 },
-+			1900, 1, 4, 1, 1, 1, 1, 1 },
- 		{ VALID_ALL, VALID_ALL, WLAN_RC_PHY_CCK, 5500, /* 5.5 Mb */
--			4900, 0x19, 0x04, 11,
--			2, 2, 2, 2, 2, 0 },
-+			4900, 2, 11, 2, 2, 2, 2, 2 },
- 		{ VALID_ALL, VALID_ALL, WLAN_RC_PHY_CCK, 11000, /* 11 Mb */
--			8100, 0x18, 0x04, 22,
--			3, 3, 3, 3, 3, 0 },
-+			8100, 3, 22, 3, 3, 3, 3, 3 },
- 		{ INVALID, INVALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
--			5400, 0x0b, 0x00, 12,
--			4, 4, 4, 4, 4, 0 },
-+			5400, 4, 12, 4, 4, 4, 4, 4 },
- 		{ INVALID, INVALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
--			7800, 0x0f, 0x00, 18,
--			4, 5, 5, 5, 5, 0 },
-+			7800, 5, 18, 4, 5, 5, 5, 5 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
--			10100, 0x0a, 0x00, 24,
--			6, 6, 6, 6, 6, 0 },
-+			10100, 6, 24, 6, 6, 6, 6, 6 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
--			14100,  0x0e, 0x00, 36,
--			6, 7, 7, 7, 7, 0 },
-+			14100, 7, 36, 6, 7, 7, 7, 7 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
--			17700, 0x09, 0x00, 48,
--			8,  8, 8, 8, 8, 0 },
-+			17700, 8, 48, 8, 8, 8, 8, 8 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
--			23700, 0x0d, 0x00, 72,
--			8,  9, 9, 9, 9, 0 },
-+			23700, 9, 72, 8, 9, 9, 9, 9 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
--			27400, 0x08, 0x00, 96,
--			8,  10, 10, 10, 10, 0 },
-+			27400, 10, 96, 8, 10, 10, 10, 10 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
--			30900, 0x0c, 0x00, 108,
--			8,  11, 11, 11, 11, 0 },
-+			30900, 11, 108, 8, 11, 11, 11, 11 },
- 		{ INVALID, INVALID, WLAN_RC_PHY_HT_20_SS, 6500, /* 6.5 Mb */
--			6400, 0x80, 0x00, 0,
--			4, 12, 28, 12, 28, 3216 },
-+			6400, 0, 0, 4, 12, 28, 12, 28 },
- 		{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 13000, /* 13 Mb */
--			12700, 0x81, 0x00, 1,
--			6, 13, 29, 13, 29, 6434 },
-+			12700, 1, 1, 6, 13, 29, 13, 29 },
- 		{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 19500, /* 19.5 Mb */
--			18800, 0x82, 0x00, 2,
--			6, 14, 30, 14, 30, 9650 },
-+			18800, 2, 2, 6, 14, 30, 14, 30 },
- 		{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 26000, /* 26 Mb */
--			25000, 0x83, 0x00, 3,
--			8,  15, 31, 15, 31, 12868 },
-+			25000, 3, 3, 8, 15, 31, 15, 31 },
- 		{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 39000, /* 39 Mb */
--			36700, 0x84, 0x00, 4,
--			8,  16, 32, 16, 32, 19304 },
-+			36700, 4, 4, 8, 16, 32, 16, 32 },
- 		{ INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 52000, /* 52 Mb */
--			48100, 0x85, 0x00, 5,
--			8,  17, 33, 17, 33, 25740 },
-+			48100, 5, 5, 8, 17, 33, 17, 33 },
- 		{ INVALID,  VALID_20, WLAN_RC_PHY_HT_20_SS, 58500, /* 58.5 Mb */
--			53500, 0x86, 0x00, 6,
--			8,  18, 34, 18, 34, 28956 },
-+			53500, 6, 6, 8, 18, 34, 18, 34 },
- 		{ INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 65000, /* 65 Mb */
--			59000, 0x87, 0x00, 7,
--			8,  19, 35, 19, 36, 32180 },
-+			59000, 7, 7, 8, 19, 35, 19, 36 },
- 		{ INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 13000, /* 13 Mb */
--			12700, 0x88, 0x00, 8,
--			4, 20, 37, 20, 37, 6430 },
-+			12700, 8, 8, 4, 20, 37, 20, 37 },
- 		{ INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 26000, /* 26 Mb */
--			24800, 0x89, 0x00, 9,
--			6, 21, 38, 21, 38, 12860 },
-+			24800, 9, 9, 6, 21, 38, 21, 38 },
- 		{ INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 39000, /* 39 Mb */
--			36600, 0x8a, 0x00, 10,
--			6, 22, 39, 22, 39, 19300 },
-+			36600, 10, 10, 6, 22, 39, 22, 39 },
- 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 52000, /* 52 Mb */
--			48100, 0x8b, 0x00, 11,
--			8,  23, 40, 23, 40, 25736 },
-+			48100, 11, 11, 8, 23, 40, 23, 40 },
- 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 78000, /* 78 Mb */
--			69500, 0x8c, 0x00, 12,
--			8,  24, 41, 24, 41, 38600 },
-+			69500, 12, 12, 8, 24, 41, 24, 41 },
- 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 104000, /* 104 Mb */
--			89500, 0x8d, 0x00, 13,
--			8,  25, 42, 25, 42, 51472 },
-+			89500, 13, 13, 8, 25, 42, 25, 42 },
- 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 117000, /* 117 Mb */
--			98900, 0x8e, 0x00, 14,
--			8,  26, 43, 26, 44, 57890 },
-+			98900, 14, 14, 8, 26, 43, 26, 44 },
- 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 130000, /* 130 Mb */
--			108300, 0x8f, 0x00, 15,
--			8,  27, 44, 27, 45, 64320 },
-+			108300, 15, 15, 8, 27, 44, 27, 45 },
- 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 13500, /* 13.5 Mb */
--			13200, 0x80, 0x00, 0,
--			8, 12, 28, 28, 28, 6684 },
-+			13200, 0, 0, 8, 12, 28, 28, 28 },
- 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 27500, /* 27.0 Mb */
--			25900, 0x81, 0x00, 1,
--			8, 13, 29, 29, 29, 13368 },
-+			25900, 1, 1, 8, 13, 29, 29, 29 },
- 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 40500, /* 40.5 Mb */
--			38600, 0x82, 0x00, 2,
--			8, 14, 30, 30, 30, 20052 },
-+			38600, 2, 2, 8, 14, 30, 30, 30 },
- 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 54000, /* 54 Mb */
--			49800, 0x83, 0x00, 3,
--			8,  15, 31, 31, 31, 26738 },
-+			49800, 3, 3, 8,  15, 31, 31, 31 },
- 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 81500, /* 81 Mb */
--			72200, 0x84, 0x00, 4,
--			8,  16, 32, 32, 32, 40104 },
-+			72200, 4, 4, 8, 16, 32, 32, 32 },
- 		{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 108000, /* 108 Mb */
--			92900, 0x85, 0x00, 5,
--			8,  17, 33, 33, 33, 53476 },
-+			92900, 5, 5, 8, 17, 33, 33, 33 },
- 		{ INVALID,  VALID_40, WLAN_RC_PHY_HT_40_SS, 121500, /* 121.5 Mb */
--			102700, 0x86, 0x00, 6,
--			8,  18, 34, 34, 34, 60156 },
-+			102700, 6, 6, 8, 18, 34, 34, 34 },
- 		{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 135000, /* 135 Mb */
--			112000, 0x87, 0x00, 7,
--			8,  19, 35, 36, 36, 66840 },
-+			112000, 7, 7, 8, 19, 35, 36, 36 },
- 		{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS_HGI, 150000, /* 150 Mb */
--			122000, 0x87, 0x00, 7,
--			8,  19, 35, 36, 36, 74200 },
-+			122000, 7, 7, 8, 19, 35, 36, 36 },
- 		{ INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 27000, /* 27 Mb */
--			25800, 0x88, 0x00, 8,
--			8, 20, 37, 37, 37, 13360 },
-+			25800, 8, 8, 8, 20, 37, 37, 37 },
- 		{ INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 54000, /* 54 Mb */
--			49800, 0x89, 0x00, 9,
--			8, 21, 38, 38, 38, 26720 },
-+			49800, 9, 9, 8, 21, 38, 38, 38 },
- 		{ INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 81000, /* 81 Mb */
--			71900, 0x8a, 0x00, 10,
--			8, 22, 39, 39, 39, 40080 },
-+			71900, 10, 10, 8, 22, 39, 39, 39 },
- 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 108000, /* 108 Mb */
--			92500, 0x8b, 0x00, 11,
--			8,  23, 40, 40, 40, 53440 },
-+			92500, 11, 11, 8, 23, 40, 40, 40 },
- 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 162000, /* 162 Mb */
--			130300, 0x8c, 0x00, 12,
--			8,  24, 41, 41, 41, 80160 },
-+			130300, 12, 12, 8, 24, 41, 41, 41 },
- 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 216000, /* 216 Mb */
--			162800, 0x8d, 0x00, 13,
--			8,  25, 42, 42, 42, 106880 },
-+			162800, 13, 13, 8, 25, 42, 42, 42 },
- 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 243000, /* 243 Mb */
--			178200, 0x8e, 0x00, 14,
--			8,  26, 43, 43, 43, 120240 },
-+			178200, 14, 14, 8, 26, 43, 43, 43 },
- 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 270000, /* 270 Mb */
--			192100, 0x8f, 0x00, 15,
--			8,  27, 44, 45, 45, 133600 },
-+			192100, 15, 15, 8, 27, 44, 45, 45 },
- 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS_HGI, 300000, /* 300 Mb */
--			207000, 0x8f, 0x00, 15,
--			8,  27, 44, 45, 45, 148400 },
--		},
-+			207000, 15, 15, 8, 27, 44, 45, 45 },
-+	},
- 	50,  /* probe interval */
- 	WLAN_RC_HT_FLAG,  /* Phy rates allowed initially */
- };
+ 			900, 0x1b, 0x00, 2,
+@@ -302,6 +304,7 @@ static const struct ath_rate_table ar541
  
  static const struct ath_rate_table ar5416_11a_ratetable = {
  	8,
 +	0,
  	{
  		{ VALID, VALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
--			5400, 0x0b, 0x00, (0x80|12),
--			0, 0, 0 },
-+			5400, 0, 12, 0, 0, 0 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
--			7800, 0x0f, 0x00, 18,
--			0, 1, 0 },
-+			7800,  1, 18, 0, 1, 0 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
--			10000, 0x0a, 0x00, (0x80|24),
--			2, 2, 0 },
-+			10000, 2, 24, 2, 2, 0 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
--			13900, 0x0e, 0x00, 36,
--			2, 3, 0 },
-+			13900, 3, 36, 2, 3, 0 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
--			17300, 0x09, 0x00, (0x80|48),
--			4,  4, 0 },
-+			17300, 4, 48, 4, 4, 0 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
--			23000, 0x0d, 0x00, 72,
--			4,  5, 0 },
-+			23000, 5, 72, 4, 5, 0 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
--			27400, 0x08, 0x00, 96,
--			4,  6, 0 },
-+			27400, 6, 96, 4, 6, 0 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
--			29300, 0x0c, 0x00, 108,
--			4,  7, 0 },
-+			29300, 7, 108, 4, 7, 0 },
- 	},
- 	50,  /* probe interval */
- 	0,   /* Phy rates allowed initially */
-@@ -334,48 +241,51 @@ static const struct ath_rate_table ar541
+ 			5400, 0x0b, 0x00, (0x80|12),
+@@ -334,6 +337,7 @@ static const struct ath_rate_table ar541
  
  static const struct ath_rate_table ar5416_11g_ratetable = {
  	12,
 +	0,
  	{
  		{ VALID, VALID, WLAN_RC_PHY_CCK, 1000, /* 1 Mb */
--			900, 0x1b, 0x00, 2,
--			0, 0, 0 },
-+			900, 0, 2, 0, 0, 0 },
- 		{ VALID, VALID, WLAN_RC_PHY_CCK, 2000, /* 2 Mb */
--			1900, 0x1a, 0x04, 4,
--			1, 1, 0 },
-+			1900, 1, 4, 1, 1, 0 },
- 		{ VALID, VALID, WLAN_RC_PHY_CCK, 5500, /* 5.5 Mb */
--			4900, 0x19, 0x04, 11,
--			2, 2, 0 },
-+			4900, 2, 11, 2, 2, 0 },
- 		{ VALID, VALID, WLAN_RC_PHY_CCK, 11000, /* 11 Mb */
--			8100, 0x18, 0x04, 22,
--			3, 3, 0 },
-+			8100, 3, 22, 3, 3, 0 },
- 		{ INVALID, INVALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
--			5400, 0x0b, 0x00, 12,
--			4, 4, 0 },
-+			5400, 4, 12, 4, 4, 0 },
- 		{ INVALID, INVALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
--			7800, 0x0f, 0x00, 18,
--			4, 5, 0 },
-+			7800, 5, 18, 4, 5, 0 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
--			10000, 0x0a, 0x00, 24,
--			6, 6, 0 },
-+			10000, 6, 24, 6, 6, 0 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
--			13900, 0x0e, 0x00, 36,
--			6, 7, 0 },
-+			13900, 7, 36, 6, 7, 0 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
--			17300, 0x09, 0x00, 48,
--			8,  8, 0 },
-+			17300, 8, 48, 8, 8, 0 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
--			23000, 0x0d, 0x00, 72,
--			8,  9, 0 },
-+			23000, 9, 72, 8, 9, 0 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
--			27400, 0x08, 0x00, 96,
--			8,  10, 0 },
-+			27400, 10, 96, 8, 10, 0 },
- 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
--			29300, 0x0c, 0x00, 108,
--			8,  11, 0 },
-+			29300, 11, 108, 8, 11, 0 },
- 	},
- 	50,  /* probe interval */
+ 			900, 0x1b, 0x00, 2,
+@@ -376,6 +380,20 @@ static const struct ath_rate_table ar541
  	0,   /* Phy rates allowed initially */
  };
  
@@ -488,7 +53,7 @@
  static inline int8_t median(int8_t a, int8_t b, int8_t c)
  {
  	if (a >= b) {
-@@ -534,7 +444,7 @@ static u8 ath_rc_setvalid_rates(struct a
+@@ -534,7 +552,7 @@ static u8 ath_rc_setvalid_rates(struct a
  			 * capflag matches one of the validity
  			 * (VALID/VALID_20/VALID_40) flags */
  
@@ -497,7 +62,7 @@
  			    ((valid & WLAN_RC_CAP_MODE(capflag)) ==
  			     WLAN_RC_CAP_MODE(capflag)) &&
  			    !WLAN_RC_PHY_HT(phy)) {
-@@ -576,8 +486,7 @@ static u8 ath_rc_setvalid_htrates(struct
+@@ -576,8 +594,7 @@ static u8 ath_rc_setvalid_htrates(struct
  			u8 rate = rateset->rs_rates[i];
  			u8 dot11rate = rate_table->info[j].dot11rate;
  
@@ -507,7 +72,7 @@
  			    !WLAN_RC_PHY_HT_VALID(valid, capflag))
  				continue;
  
-@@ -696,18 +605,20 @@ static void ath_rc_rate_set_series(const
+@@ -696,18 +713,20 @@ static void ath_rc_rate_set_series(const
  				   u8 tries, u8 rix, int rtsctsenable)
  {
  	rate->count = tries;
@@ -534,7 +99,7 @@
  }
  
  static void ath_rc_rate_set_rtscts(struct ath_softc *sc,
-@@ -720,7 +631,7 @@ static void ath_rc_rate_set_rtscts(struc
+@@ -720,7 +739,7 @@ static void ath_rc_rate_set_rtscts(struc
  	/* get the cix for the lowest valid rix */
  	for (i = 3; i >= 0; i--) {
  		if (rates[i].count && (rates[i].idx >= 0)) {
@@ -543,7 +108,7 @@
  			break;
  		}
  	}
-@@ -1080,15 +991,19 @@ static int ath_rc_get_rateindex(const st
+@@ -1080,15 +1099,19 @@ static int ath_rc_get_rateindex(const st
  {
  	int rix;
  
@@ -567,7 +132,7 @@
  
  	return rix;
  }
-@@ -1183,7 +1098,9 @@ struct ath_rate_table *ath_choose_rate_t
+@@ -1183,7 +1206,9 @@ struct ath_rate_table *ath_choose_rate_t
  
  	ath_print(common, ATH_DBG_CONFIG,
  		  "Choosing rate table for mode: %d\n", mode);
@@ -578,7 +143,7 @@
  }
  
  static void ath_rc_init(struct ath_softc *sc,
-@@ -1197,12 +1114,6 @@ static void ath_rc_init(struct ath_softc
+@@ -1197,12 +1222,6 @@ static void ath_rc_init(struct ath_softc
  	u8 *ht_mcs = (u8 *)&ath_rc_priv->neg_ht_rates;
  	u8 i, j, k, hi = 0, hthi = 0;
  
@@ -591,7 +156,7 @@
  	/* Initial rate table size. Will change depending
  	 * on the working rate set */
  	ath_rc_priv->rate_table_size = RATE_TABLE_SIZE;
-@@ -1357,7 +1268,8 @@ static void ath_tx_status(void *priv, st
+@@ -1357,7 +1376,8 @@ static void ath_tx_status(void *priv, st
  		}
  	}
  
@@ -601,7 +166,7 @@
  }
  
  static void ath_rate_init(void *priv, struct ieee80211_supported_band *sband,
-@@ -1365,7 +1277,7 @@ static void ath_rate_init(void *priv, st
+@@ -1365,7 +1385,7 @@ static void ath_rate_init(void *priv, st
  {
  	struct ath_softc *sc = priv;
  	struct ath_rate_priv *ath_rc_priv = priv_sta;
@@ -610,7 +175,7 @@
  	bool is_cw40, is_sgi40;
  	int i, j = 0;
  
-@@ -1397,11 +1309,9 @@ static void ath_rate_init(void *priv, st
+@@ -1397,11 +1417,9 @@ static void ath_rate_init(void *priv, st
  	    (sc->sc_ah->opmode == NL80211_IFTYPE_MESH_POINT) ||
  	    (sc->sc_ah->opmode == NL80211_IFTYPE_ADHOC)) {
  		rate_table = ath_choose_rate_table(sc, sband->band,
@@ -625,7 +190,7 @@
  	}
  
  	ath_rc_priv->ht_cap = ath_rc_build_ht_caps(sc, sta, is_cw40, is_sgi40);
-@@ -1445,6 +1355,7 @@ static void ath_rate_update(void *priv, 
+@@ -1445,6 +1463,7 @@ static void ath_rate_update(void *priv, 
  			ath_print(ath9k_hw_common(sc->sc_ah), ATH_DBG_CONFIG,
  				  "Operating HT Bandwidth changed to: %d\n",
  				  sc->hw->conf.channel_type);
@@ -633,7 +198,7 @@
  		}
  	}
  }
-@@ -1497,26 +1408,6 @@ static struct rate_control_ops ath_rate_
+@@ -1497,26 +1516,6 @@ static struct rate_control_ops ath_rate_
  	.free_sta = ath_rate_free_sta,
  };
  
@@ -879,6 +444,18 @@
  	}
  
  	/* set dur_update_en for l-sig computation except for PS-Poll frames */
+@@ -1925,8 +1967,10 @@ static void ath_tx_rc_status(struct ath_
+ 		}
+ 	}
+ 
+-	for (i = tx_rateindex + 1; i < hw->max_rates; i++)
++	for (i = tx_rateindex + 1; i < hw->max_rates; i++) {
+ 		tx_info->status.rates[i].count = 0;
++		tx_info->status.rates[i].idx = -1;
++	}
+ 
+ 	tx_info->status.rates[tx_rateindex].count = bf->bf_retries + 1;
+ }
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
 @@ -21,7 +21,6 @@
@@ -910,50 +487,34 @@
  	struct ath_led radio_led;
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -105,37 +105,71 @@ static struct ieee80211_channel ath9k_5g
+@@ -105,37 +105,55 @@ static struct ieee80211_channel ath9k_5g
  	CHAN5G(5825, 37), /* Channel 165 */
  };
  
++/* Atheros hardware rate code addition for short premble */
++#define SHPCHECK(__hw_rate, __flags) \
++	((__flags & IEEE80211_RATE_SHORT_PREAMBLE) ? (__hw_rate | 0x04 ) : 0)
++
++#define RATE(_bitrate, _hw_rate, _flags) {              \
++	.bitrate        = (_bitrate),                   \
++	.flags          = (_flags),                     \
++	.hw_value       = (_hw_rate),                   \
++	.hw_value_short = (SHPCHECK(_hw_rate, _flags))  \
++}
++
 +static struct ieee80211_rate ath9k_legacy_rates[] = {
-+	{ .bitrate = 10,
-+	  .hw_value = 0x1b,
-+	  .flags = 0 },
-+	{ .bitrate = 20,
-+	  .hw_value = 0x1a,
-+	  .hw_value_short = 0x1a | 0x04,
-+	  .flags = IEEE80211_RATE_SHORT_PREAMBLE },
-+	{ .bitrate = 55,
-+	  .hw_value = 0x19,
-+	  .hw_value_short = 0x19 | 0x04,
-+	  .flags = IEEE80211_RATE_SHORT_PREAMBLE },
-+	{ .bitrate = 110,
-+	  .hw_value = 0x18,
-+	  .hw_value_short = 0x18 | 0x4,
-+	  .flags = IEEE80211_RATE_SHORT_PREAMBLE },
-+	{ .bitrate = 60,
-+	  .hw_value = 0x0b,
-+	  .flags = 0 },
-+	{ .bitrate = 90,
-+	  .hw_value = 0x0f,
-+	  .flags = 0 },
-+	{ .bitrate = 120,
-+	  .hw_value = 0x0a,
-+	  .flags = 0 },
-+	{ .bitrate = 180,
-+	  .hw_value = 0x0e,
-+	  .flags = 0 },
-+	{ .bitrate = 240,
-+	  .hw_value = 0x09,
-+	  .flags = 0 },
-+	{ .bitrate = 360,
-+	  .hw_value = 0x0d,
-+	  .flags = 0 },
-+	{ .bitrate = 480,
-+	  .hw_value = 0x08,
-+	  .flags = 0 },
-+	{ .bitrate = 540,
-+	  .hw_value = 0x0c,
-+	  .flags = 0 },
++	RATE(10, 0x1b, 0),
++	RATE(20, 0x1a, IEEE80211_RATE_SHORT_PREAMBLE),
++	RATE(55, 0x19, IEEE80211_RATE_SHORT_PREAMBLE),
++	RATE(110, 0x18, IEEE80211_RATE_SHORT_PREAMBLE),
++	RATE(60, 0x0b, 0),
++	RATE(90, 0x0f, 0),
++	RATE(120, 0x0a, 0),
++	RATE(180, 0x0e, 0),
++	RATE(240, 0x09, 0),
++	RATE(360, 0x0d, 0),
++	RATE(480, 0x08, 0),
++	RATE(540, 0x0c, 0),
 +};
 +
  static void ath_cache_conf_rate(struct ath_softc *sc,
@@ -998,7 +559,7 @@
  		break;
  	default:
  		BUG_ON(1);
-@@ -191,51 +225,6 @@ static u8 parse_mpdudensity(u8 mpdudensi
+@@ -191,51 +209,6 @@ static u8 parse_mpdudensity(u8 mpdudensi
  	}
  }
  
@@ -1050,7 +611,7 @@
  static struct ath9k_channel *ath_get_curchannel(struct ath_softc *sc,
  						struct ieee80211_hw *hw)
  {
-@@ -1713,12 +1702,6 @@ static int ath_init_softc(u16 devid, str
+@@ -1713,12 +1686,6 @@ static int ath_init_softc(u16 devid, str
  	/* default to MONITOR mode */
  	sc->sc_ah->opmode = NL80211_IFTYPE_MONITOR;
  
@@ -1063,7 +624,7 @@
  	/*
  	 * Allocate hardware transmit queues: one queue for
  	 * beacon frames and one data queue for each QoS
-@@ -1839,19 +1822,22 @@ static int ath_init_softc(u16 devid, str
+@@ -1839,19 +1806,22 @@ static int ath_init_softc(u16 devid, str
  	/* setup channels and rates */
  
  	sc->sbands[IEEE80211_BAND_2GHZ].channels = ath9k_2ghz_chantable;
@@ -1100,22 +661,7 @@
  	struct {
  		int valid;
  		int valid_single_stream;
-@@ -111,14 +112,12 @@ struct ath_rate_table {
- 		u32 ratekbps;
- 		u32 user_ratekbps;
- 		u8 ratecode;
--		u8 short_preamble;
- 		u8 dot11rate;
- 		u8 ctrl_rate;
- 		u8 base_index;
- 		u8 cw40index;
- 		u8 sgi_index;
- 		u8 ht_index;
--		u32 max_4ms_framelen;
- 	} info[RATE_TABLE_SIZE];
- 	u32 probe_interval;
- 	u8 initial_ratemax;
-@@ -179,8 +178,6 @@ enum ath9k_internal_frame_type {
+@@ -179,8 +180,6 @@ enum ath9k_internal_frame_type {
  	ATH9K_INT_UNPAUSE
  };
  
@@ -1144,7 +690,7 @@
  
 -	rt = sc->cur_rate_table;
 -	rate = rt->info[0].ratecode;
-+	sband = &sc->sbands[sc->hw->conf.channel->band];
++	sband = &sc->sbands[common->hw->conf.channel->band];
 +	rate = sband->bitrates[0].hw_value;
  	if (sc->sc_flags & SC_OP_PREAMBLE_SHORT)
 -		rate |= rt->info[0].short_preamble;
diff --git a/package/mac80211/patches/561-ath9k_rc_table_cleanup.patch b/package/mac80211/patches/561-ath9k_rc_table_cleanup.patch
new file mode 100644
index 0000000000..64bf9a6700
--- /dev/null
+++ b/package/mac80211/patches/561-ath9k_rc_table_cleanup.patch
@@ -0,0 +1,477 @@
+--- a/drivers/net/wireless/ath/ath9k/rc.h
++++ b/drivers/net/wireless/ath/ath9k/rc.h
+@@ -112,14 +112,12 @@ struct ath_rate_table {
+ 		u32 ratekbps;
+ 		u32 user_ratekbps;
+ 		u8 ratecode;
+-		u8 short_preamble;
+ 		u8 dot11rate;
+ 		u8 ctrl_rate;
+ 		u8 base_index;
+ 		u8 cw40index;
+ 		u8 sgi_index;
+ 		u8 ht_index;
+-		u32 max_4ms_framelen;
+ 	} info[RATE_TABLE_SIZE];
+ 	u32 probe_interval;
+ 	u8 initial_ratemax;
+--- a/drivers/net/wireless/ath/ath9k/rc.c
++++ b/drivers/net/wireless/ath/ath9k/rc.c
+@@ -22,131 +22,89 @@ static const struct ath_rate_table ar541
+ 	8, /* MCS start */
+ 	{
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
+-			5400, 0x0b, 0x00, 12,
+-			0, 0, 0, 0, 0, 0 },
++			5400, 0, 12, 0, 0, 0, 0, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
+-			7800,  0x0f, 0x00, 18,
+-			0, 1, 1, 1, 1, 0 },
++			7800,  1, 18, 0, 1, 1, 1, 1 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
+-			10000, 0x0a, 0x00, 24,
+-			2, 2, 2, 2, 2, 0 },
++			10000, 2, 24, 2, 2, 2, 2, 2 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
+-			13900, 0x0e, 0x00, 36,
+-			2,  3, 3, 3, 3, 0 },
++			13900, 3, 36, 2, 3, 3, 3, 3 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
+-			17300, 0x09, 0x00, 48,
+-			4,  4, 4, 4, 4, 0 },
++			17300, 4, 48, 4, 4, 4, 4, 4 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
+-			23000, 0x0d, 0x00, 72,
+-			4,  5, 5, 5, 5, 0 },
++			23000, 5, 72, 4, 5, 5, 5, 5 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
+-			27400, 0x08, 0x00, 96,
+-			4,  6, 6, 6, 6, 0 },
++			27400, 6, 96, 4, 6, 6, 6, 6 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
+-			29300, 0x0c, 0x00, 108,
+-			4,  7, 7, 7, 7, 0 },
++			29300, 7, 108, 4, 7, 7, 7, 7 },
+ 		{ VALID_2040, VALID_2040, WLAN_RC_PHY_HT_20_SS, 6500, /* 6.5 Mb */
+-			6400, 0x80, 0x00, 0,
+-			0, 8, 24, 8, 24, 3216 },
++			6400, 0, 0, 0, 8, 24, 8, 24 },
+ 		{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 13000, /* 13 Mb */
+-			12700, 0x81, 0x00, 1,
+-			2, 9, 25, 9, 25, 6434 },
++			12700, 1, 1, 2, 9, 25, 9, 25 },
+ 		{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 19500, /* 19.5 Mb */
+-			18800, 0x82, 0x00, 2,
+-			2, 10, 26, 10, 26, 9650 },
++			18800, 2, 2, 2, 10, 26, 10, 26 },
+ 		{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 26000, /* 26 Mb */
+-			25000, 0x83, 0x00, 3,
+-			4,  11, 27, 11, 27, 12868 },
++			25000, 3, 3, 4, 11, 27, 11, 27 },
+ 		{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 39000, /* 39 Mb */
+-			36700, 0x84, 0x00, 4,
+-			4,  12, 28, 12, 28, 19304 },
++			36700, 4, 4, 4, 12, 28, 12, 28 },
+ 		{ INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 52000, /* 52 Mb */
+-			48100, 0x85, 0x00, 5,
+-			4,  13, 29, 13, 29, 25740 },
++			48100, 5, 5, 4, 13, 29, 13, 29 },
+ 		{ INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 58500, /* 58.5 Mb */
+-			53500, 0x86, 0x00, 6,
+-			4,  14, 30, 14, 30,  28956 },
++			53500, 6, 6, 4, 14, 30, 14, 30 },
+ 		{ INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 65000, /* 65 Mb */
+-			59000, 0x87, 0x00, 7,
+-			4,  15, 31, 15, 32, 32180 },
++			59000, 7, 7, 4, 15, 31, 15, 32 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 13000, /* 13 Mb */
+-			12700, 0x88, 0x00,
+-			8, 3, 16, 33, 16, 33, 6430 },
++			12700, 8, 8, 3, 16, 33, 16, 33 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 26000, /* 26 Mb */
+-			24800, 0x89, 0x00, 9,
+-			2, 17, 34, 17, 34, 12860 },
++			24800, 9, 9, 2, 17, 34, 17, 34 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 39000, /* 39 Mb */
+-			36600, 0x8a, 0x00, 10,
+-			2, 18, 35, 18, 35, 19300 },
++			36600, 10, 10, 2, 18, 35, 18, 35 },
+ 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 52000, /* 52 Mb */
+-			48100, 0x8b, 0x00, 11,
+-			4,  19, 36, 19, 36, 25736 },
++			48100, 11, 11, 4, 19, 36, 19, 36 },
+ 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 78000, /* 78 Mb */
+-			69500, 0x8c, 0x00, 12,
+-			4,  20, 37, 20, 37, 38600 },
++			69500, 12, 12, 4, 20, 37, 20, 37 },
+ 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 104000, /* 104 Mb */
+-			89500, 0x8d, 0x00, 13,
+-			4,  21, 38, 21, 38, 51472 },
++			89500, 13, 13, 4, 21, 38, 21, 38 },
+ 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 117000, /* 117 Mb */
+-			98900, 0x8e, 0x00, 14,
+-			4,  22, 39, 22, 39, 57890 },
++			98900, 14, 14, 4, 22, 39, 22, 39 },
+ 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 130000, /* 130 Mb */
+-			108300, 0x8f, 0x00, 15,
+-			4,  23, 40, 23, 41, 64320 },
++			108300, 15, 15, 4, 23, 40, 23, 41 },
+ 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 13500, /* 13.5 Mb */
+-			13200, 0x80, 0x00, 0,
+-			0, 8, 24, 24, 24, 6684 },
++			13200, 0, 0, 0, 8, 24, 24, 24 },
+ 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 27500, /* 27.0 Mb */
+-			25900, 0x81, 0x00, 1,
+-			2, 9, 25, 25, 25, 13368 },
++			25900, 1, 1, 2, 9, 25, 25, 25 },
+ 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 40500, /* 40.5 Mb */
+-			38600, 0x82, 0x00, 2,
+-			2, 10, 26, 26, 26, 20052 },
++			38600, 2, 2, 2, 10, 26, 26, 26 },
+ 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 54000, /* 54 Mb */
+-			49800, 0x83, 0x00, 3,
+-			4,  11, 27, 27, 27, 26738 },
++			49800, 3, 3, 4, 11, 27, 27, 27 },
+ 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 81500, /* 81 Mb */
+-			72200, 0x84, 0x00, 4,
+-			4,  12, 28, 28, 28, 40104 },
++			72200, 4, 4, 4, 12, 28, 28, 28 },
+ 		{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 108000, /* 108 Mb */
+-			92900, 0x85, 0x00, 5,
+-			4,  13, 29, 29, 29, 53476 },
++			92900, 5, 5, 4, 13, 29, 29, 29 },
+ 		{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 121500, /* 121.5 Mb */
+-			102700, 0x86, 0x00, 6,
+-			4,  14, 30, 30, 30, 60156 },
++			102700, 6, 6, 4, 14, 30, 30, 30 },
+ 		{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 135000, /* 135 Mb */
+-			112000, 0x87, 0x00, 7,
+-			4,  15, 31, 32, 32, 66840 },
++			112000, 7, 7, 4, 15, 31, 32, 32 },
+ 		{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS_HGI, 150000, /* 150 Mb */
+-			122000, 0x87, 0x00, 7,
+-			4,  15, 31, 32, 32, 74200 },
++			122000, 7, 7, 4, 15, 31, 32, 32 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 27000, /* 27 Mb */
+-			25800, 0x88, 0x00, 8,
+-			0, 16, 33, 33, 33, 13360 },
++			25800, 8, 8, 0, 16, 33, 33, 33 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 54000, /* 54 Mb */
+-			49800, 0x89, 0x00, 9,
+-			2, 17, 34, 34, 34, 26720 },
++			49800, 9, 9, 2, 17, 34, 34, 34 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 81000, /* 81 Mb */
+-			71900, 0x8a, 0x00, 10,
+-			2, 18, 35, 35, 35, 40080 },
++			71900, 10, 10, 2, 18, 35, 35, 35 },
+ 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 108000, /* 108 Mb */
+-			92500, 0x8b, 0x00, 11,
+-			4,  19, 36, 36, 36, 53440 },
++			92500, 11, 11, 4, 19, 36, 36, 36 },
+ 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 162000, /* 162 Mb */
+-			130300, 0x8c, 0x00, 12,
+-			4,  20, 37, 37, 37, 80160 },
++			130300, 12, 12, 4, 20, 37, 37, 37 },
+ 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 216000, /* 216 Mb */
+-			162800, 0x8d, 0x00, 13,
+-			4,  21, 38, 38, 38, 106880 },
++			162800, 13, 13, 4, 21, 38, 38, 38 },
+ 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 243000, /* 243 Mb */
+-			178200, 0x8e, 0x00, 14,
+-			4,  22, 39, 39, 39, 120240 },
++			178200, 14, 14, 4, 22, 39, 39, 39 },
+ 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 270000, /* 270 Mb */
+-			192100, 0x8f, 0x00, 15,
+-			4,  23, 40, 41, 41, 133600 },
++			192100, 15, 15, 4, 23, 40, 41, 41 },
+ 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS_HGI, 300000, /* 300 Mb */
+-			207000, 0x8f, 0x00, 15,
+-			4,  23, 40, 41, 41, 148400 },
++			207000, 15, 15, 4, 23, 40, 41, 41 },
+ 	},
+ 	50,  /* probe interval */
+ 	WLAN_RC_HT_FLAG,  /* Phy rates allowed initially */
+@@ -160,144 +118,98 @@ static const struct ath_rate_table ar541
+ 	12, /* MCS start */
+ 	{
+ 		{ VALID_ALL, VALID_ALL, WLAN_RC_PHY_CCK, 1000, /* 1 Mb */
+-			900, 0x1b, 0x00, 2,
+-			0, 0, 0, 0, 0, 0 },
++			900, 0, 2, 0, 0, 0, 0, 0 },
+ 		{ VALID_ALL, VALID_ALL, WLAN_RC_PHY_CCK, 2000, /* 2 Mb */
+-			1900, 0x1a, 0x04, 4,
+-			1, 1, 1, 1, 1, 0 },
++			1900, 1, 4, 1, 1, 1, 1, 1 },
+ 		{ VALID_ALL, VALID_ALL, WLAN_RC_PHY_CCK, 5500, /* 5.5 Mb */
+-			4900, 0x19, 0x04, 11,
+-			2, 2, 2, 2, 2, 0 },
++			4900, 2, 11, 2, 2, 2, 2, 2 },
+ 		{ VALID_ALL, VALID_ALL, WLAN_RC_PHY_CCK, 11000, /* 11 Mb */
+-			8100, 0x18, 0x04, 22,
+-			3, 3, 3, 3, 3, 0 },
++			8100, 3, 22, 3, 3, 3, 3, 3 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
+-			5400, 0x0b, 0x00, 12,
+-			4, 4, 4, 4, 4, 0 },
++			5400, 4, 12, 4, 4, 4, 4, 4 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
+-			7800, 0x0f, 0x00, 18,
+-			4, 5, 5, 5, 5, 0 },
++			7800, 5, 18, 4, 5, 5, 5, 5 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
+-			10100, 0x0a, 0x00, 24,
+-			6, 6, 6, 6, 6, 0 },
++			10100, 6, 24, 6, 6, 6, 6, 6 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
+-			14100,  0x0e, 0x00, 36,
+-			6, 7, 7, 7, 7, 0 },
++			14100, 7, 36, 6, 7, 7, 7, 7 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
+-			17700, 0x09, 0x00, 48,
+-			8,  8, 8, 8, 8, 0 },
++			17700, 8, 48, 8, 8, 8, 8, 8 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
+-			23700, 0x0d, 0x00, 72,
+-			8,  9, 9, 9, 9, 0 },
++			23700, 9, 72, 8, 9, 9, 9, 9 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
+-			27400, 0x08, 0x00, 96,
+-			8,  10, 10, 10, 10, 0 },
++			27400, 10, 96, 8, 10, 10, 10, 10 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
+-			30900, 0x0c, 0x00, 108,
+-			8,  11, 11, 11, 11, 0 },
++			30900, 11, 108, 8, 11, 11, 11, 11 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_20_SS, 6500, /* 6.5 Mb */
+-			6400, 0x80, 0x00, 0,
+-			4, 12, 28, 12, 28, 3216 },
++			6400, 0, 0, 4, 12, 28, 12, 28 },
+ 		{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 13000, /* 13 Mb */
+-			12700, 0x81, 0x00, 1,
+-			6, 13, 29, 13, 29, 6434 },
++			12700, 1, 1, 6, 13, 29, 13, 29 },
+ 		{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 19500, /* 19.5 Mb */
+-			18800, 0x82, 0x00, 2,
+-			6, 14, 30, 14, 30, 9650 },
++			18800, 2, 2, 6, 14, 30, 14, 30 },
+ 		{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 26000, /* 26 Mb */
+-			25000, 0x83, 0x00, 3,
+-			8,  15, 31, 15, 31, 12868 },
++			25000, 3, 3, 8, 15, 31, 15, 31 },
+ 		{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 39000, /* 39 Mb */
+-			36700, 0x84, 0x00, 4,
+-			8,  16, 32, 16, 32, 19304 },
++			36700, 4, 4, 8, 16, 32, 16, 32 },
+ 		{ INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 52000, /* 52 Mb */
+-			48100, 0x85, 0x00, 5,
+-			8,  17, 33, 17, 33, 25740 },
++			48100, 5, 5, 8, 17, 33, 17, 33 },
+ 		{ INVALID,  VALID_20, WLAN_RC_PHY_HT_20_SS, 58500, /* 58.5 Mb */
+-			53500, 0x86, 0x00, 6,
+-			8,  18, 34, 18, 34, 28956 },
++			53500, 6, 6, 8, 18, 34, 18, 34 },
+ 		{ INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 65000, /* 65 Mb */
+-			59000, 0x87, 0x00, 7,
+-			8,  19, 35, 19, 36, 32180 },
++			59000, 7, 7, 8, 19, 35, 19, 36 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 13000, /* 13 Mb */
+-			12700, 0x88, 0x00, 8,
+-			4, 20, 37, 20, 37, 6430 },
++			12700, 8, 8, 4, 20, 37, 20, 37 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 26000, /* 26 Mb */
+-			24800, 0x89, 0x00, 9,
+-			6, 21, 38, 21, 38, 12860 },
++			24800, 9, 9, 6, 21, 38, 21, 38 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 39000, /* 39 Mb */
+-			36600, 0x8a, 0x00, 10,
+-			6, 22, 39, 22, 39, 19300 },
++			36600, 10, 10, 6, 22, 39, 22, 39 },
+ 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 52000, /* 52 Mb */
+-			48100, 0x8b, 0x00, 11,
+-			8,  23, 40, 23, 40, 25736 },
++			48100, 11, 11, 8, 23, 40, 23, 40 },
+ 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 78000, /* 78 Mb */
+-			69500, 0x8c, 0x00, 12,
+-			8,  24, 41, 24, 41, 38600 },
++			69500, 12, 12, 8, 24, 41, 24, 41 },
+ 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 104000, /* 104 Mb */
+-			89500, 0x8d, 0x00, 13,
+-			8,  25, 42, 25, 42, 51472 },
++			89500, 13, 13, 8, 25, 42, 25, 42 },
+ 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 117000, /* 117 Mb */
+-			98900, 0x8e, 0x00, 14,
+-			8,  26, 43, 26, 44, 57890 },
++			98900, 14, 14, 8, 26, 43, 26, 44 },
+ 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 130000, /* 130 Mb */
+-			108300, 0x8f, 0x00, 15,
+-			8,  27, 44, 27, 45, 64320 },
++			108300, 15, 15, 8, 27, 44, 27, 45 },
+ 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 13500, /* 13.5 Mb */
+-			13200, 0x80, 0x00, 0,
+-			8, 12, 28, 28, 28, 6684 },
++			13200, 0, 0, 8, 12, 28, 28, 28 },
+ 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 27500, /* 27.0 Mb */
+-			25900, 0x81, 0x00, 1,
+-			8, 13, 29, 29, 29, 13368 },
++			25900, 1, 1, 8, 13, 29, 29, 29 },
+ 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 40500, /* 40.5 Mb */
+-			38600, 0x82, 0x00, 2,
+-			8, 14, 30, 30, 30, 20052 },
++			38600, 2, 2, 8, 14, 30, 30, 30 },
+ 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 54000, /* 54 Mb */
+-			49800, 0x83, 0x00, 3,
+-			8,  15, 31, 31, 31, 26738 },
++			49800, 3, 3, 8,  15, 31, 31, 31 },
+ 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 81500, /* 81 Mb */
+-			72200, 0x84, 0x00, 4,
+-			8,  16, 32, 32, 32, 40104 },
++			72200, 4, 4, 8, 16, 32, 32, 32 },
+ 		{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 108000, /* 108 Mb */
+-			92900, 0x85, 0x00, 5,
+-			8,  17, 33, 33, 33, 53476 },
++			92900, 5, 5, 8, 17, 33, 33, 33 },
+ 		{ INVALID,  VALID_40, WLAN_RC_PHY_HT_40_SS, 121500, /* 121.5 Mb */
+-			102700, 0x86, 0x00, 6,
+-			8,  18, 34, 34, 34, 60156 },
++			102700, 6, 6, 8, 18, 34, 34, 34 },
+ 		{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 135000, /* 135 Mb */
+-			112000, 0x87, 0x00, 7,
+-			8,  19, 35, 36, 36, 66840 },
++			112000, 7, 7, 8, 19, 35, 36, 36 },
+ 		{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS_HGI, 150000, /* 150 Mb */
+-			122000, 0x87, 0x00, 7,
+-			8,  19, 35, 36, 36, 74200 },
++			122000, 7, 7, 8, 19, 35, 36, 36 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 27000, /* 27 Mb */
+-			25800, 0x88, 0x00, 8,
+-			8, 20, 37, 37, 37, 13360 },
++			25800, 8, 8, 8, 20, 37, 37, 37 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 54000, /* 54 Mb */
+-			49800, 0x89, 0x00, 9,
+-			8, 21, 38, 38, 38, 26720 },
++			49800, 9, 9, 8, 21, 38, 38, 38 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 81000, /* 81 Mb */
+-			71900, 0x8a, 0x00, 10,
+-			8, 22, 39, 39, 39, 40080 },
++			71900, 10, 10, 8, 22, 39, 39, 39 },
+ 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 108000, /* 108 Mb */
+-			92500, 0x8b, 0x00, 11,
+-			8,  23, 40, 40, 40, 53440 },
++			92500, 11, 11, 8, 23, 40, 40, 40 },
+ 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 162000, /* 162 Mb */
+-			130300, 0x8c, 0x00, 12,
+-			8,  24, 41, 41, 41, 80160 },
++			130300, 12, 12, 8, 24, 41, 41, 41 },
+ 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 216000, /* 216 Mb */
+-			162800, 0x8d, 0x00, 13,
+-			8,  25, 42, 42, 42, 106880 },
++			162800, 13, 13, 8, 25, 42, 42, 42 },
+ 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 243000, /* 243 Mb */
+-			178200, 0x8e, 0x00, 14,
+-			8,  26, 43, 43, 43, 120240 },
++			178200, 14, 14, 8, 26, 43, 43, 43 },
+ 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 270000, /* 270 Mb */
+-			192100, 0x8f, 0x00, 15,
+-			8,  27, 44, 45, 45, 133600 },
++			192100, 15, 15, 8, 27, 44, 45, 45 },
+ 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS_HGI, 300000, /* 300 Mb */
+-			207000, 0x8f, 0x00, 15,
+-			8,  27, 44, 45, 45, 148400 },
+-		},
++			207000, 15, 15, 8, 27, 44, 45, 45 },
++	},
+ 	50,  /* probe interval */
+ 	WLAN_RC_HT_FLAG,  /* Phy rates allowed initially */
+ };
+@@ -307,29 +219,21 @@ static const struct ath_rate_table ar541
+ 	0,
+ 	{
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
+-			5400, 0x0b, 0x00, (0x80|12),
+-			0, 0, 0 },
++			5400, 0, 12, 0, 0, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
+-			7800, 0x0f, 0x00, 18,
+-			0, 1, 0 },
++			7800,  1, 18, 0, 1, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
+-			10000, 0x0a, 0x00, (0x80|24),
+-			2, 2, 0 },
++			10000, 2, 24, 2, 2, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
+-			13900, 0x0e, 0x00, 36,
+-			2, 3, 0 },
++			13900, 3, 36, 2, 3, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
+-			17300, 0x09, 0x00, (0x80|48),
+-			4,  4, 0 },
++			17300, 4, 48, 4, 4, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
+-			23000, 0x0d, 0x00, 72,
+-			4,  5, 0 },
++			23000, 5, 72, 4, 5, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
+-			27400, 0x08, 0x00, 96,
+-			4,  6, 0 },
++			27400, 6, 96, 4, 6, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
+-			29300, 0x0c, 0x00, 108,
+-			4,  7, 0 },
++			29300, 7, 108, 4, 7, 0 },
+ 	},
+ 	50,  /* probe interval */
+ 	0,   /* Phy rates allowed initially */
+@@ -340,41 +244,29 @@ static const struct ath_rate_table ar541
+ 	0,
+ 	{
+ 		{ VALID, VALID, WLAN_RC_PHY_CCK, 1000, /* 1 Mb */
+-			900, 0x1b, 0x00, 2,
+-			0, 0, 0 },
++			900, 0, 2, 0, 0, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_CCK, 2000, /* 2 Mb */
+-			1900, 0x1a, 0x04, 4,
+-			1, 1, 0 },
++			1900, 1, 4, 1, 1, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_CCK, 5500, /* 5.5 Mb */
+-			4900, 0x19, 0x04, 11,
+-			2, 2, 0 },
++			4900, 2, 11, 2, 2, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_CCK, 11000, /* 11 Mb */
+-			8100, 0x18, 0x04, 22,
+-			3, 3, 0 },
++			8100, 3, 22, 3, 3, 0 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
+-			5400, 0x0b, 0x00, 12,
+-			4, 4, 0 },
++			5400, 4, 12, 4, 4, 0 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
+-			7800, 0x0f, 0x00, 18,
+-			4, 5, 0 },
++			7800, 5, 18, 4, 5, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
+-			10000, 0x0a, 0x00, 24,
+-			6, 6, 0 },
++			10000, 6, 24, 6, 6, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
+-			13900, 0x0e, 0x00, 36,
+-			6, 7, 0 },
++			13900, 7, 36, 6, 7, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
+-			17300, 0x09, 0x00, 48,
+-			8,  8, 0 },
++			17300, 8, 48, 8, 8, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
+-			23000, 0x0d, 0x00, 72,
+-			8,  9, 0 },
++			23000, 9, 72, 8, 9, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
+-			27400, 0x08, 0x00, 96,
+-			8,  10, 0 },
++			27400, 10, 96, 8, 10, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
+-			29300, 0x0c, 0x00, 108,
+-			8,  11, 0 },
++			29300, 11, 108, 8, 11, 0 },
+ 	},
+ 	50,  /* probe interval */
+ 	0,   /* Phy rates allowed initially */