ath9k: fix bisectability of rc patches

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

2 files changed, 548 insertions, 117 deletions

diff --git a/package/mac80211/patches/560-ath9k_rate_control_api.patch b/package/mac80211/patches/560-ath9k_rate_control_api.patch
index 5769d305ad..912ab68724 100644
--- a/package/mac80211/patches/560-ath9k_rate_control_api.patch
+++ b/package/mac80211/patches/560-ath9k_rate_control_api.patch
@@ -1,38 +1,469 @@
 --- a/drivers/net/wireless/ath/ath9k/rc.c
 +++ b/drivers/net/wireless/ath/ath9k/rc.c
-@@ -19,6 +19,7 @@
+@@ -19,132 +19,133 @@
  
  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,
-@@ -156,6 +157,7 @@ static const struct ath_rate_table ar541
+-			5400, 0x0b, 0x00, 12,
++			5400, 0, 0x00, 12,
+ 			0, 0, 0, 0, 0, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
+-			7800,  0x0f, 0x00, 18,
++			7800,  1, 0x00, 18,
+ 			0, 1, 1, 1, 1, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
+-			10000, 0x0a, 0x00, 24,
++			10000, 2, 0x00, 24,
+ 			2, 2, 2, 2, 2, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
+-			13900, 0x0e, 0x00, 36,
++			13900, 3, 0x00, 36,
+ 			2,  3, 3, 3, 3, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
+-			17300, 0x09, 0x00, 48,
++			17300, 4, 0x00, 48,
+ 			4,  4, 4, 4, 4, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
+-			23000, 0x0d, 0x00, 72,
++			23000, 5, 0x00, 72,
+ 			4,  5, 5, 5, 5, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
+-			27400, 0x08, 0x00, 96,
++			27400, 6, 0x00, 96,
+ 			4,  6, 6, 6, 6, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
+-			29300, 0x0c, 0x00, 108,
++			29300, 7, 0x00, 108,
+ 			4,  7, 7, 7, 7, 0 },
+ 		{ VALID_2040, VALID_2040, WLAN_RC_PHY_HT_20_SS, 6500, /* 6.5 Mb */
+-			6400, 0x80, 0x00, 0,
++			6400, 0, 0x00, 0,
+ 			0, 8, 24, 8, 24, 3216 },
+ 		{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 13000, /* 13 Mb */
+-			12700, 0x81, 0x00, 1,
++			12700, 1, 0x00, 1,
+ 			2, 9, 25, 9, 25, 6434 },
+ 		{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 19500, /* 19.5 Mb */
+-			18800, 0x82, 0x00, 2,
++			18800, 2, 0x00, 2,
+ 			2, 10, 26, 10, 26, 9650 },
+ 		{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 26000, /* 26 Mb */
+-			25000, 0x83, 0x00, 3,
++			25000, 3, 0x00, 3,
+ 			4,  11, 27, 11, 27, 12868 },
+ 		{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 39000, /* 39 Mb */
+-			36700, 0x84, 0x00, 4,
++			36700, 4, 0x00, 4,
+ 			4,  12, 28, 12, 28, 19304 },
+ 		{ INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 52000, /* 52 Mb */
+-			48100, 0x85, 0x00, 5,
++			48100, 5, 0x00, 5,
+ 			4,  13, 29, 13, 29, 25740 },
+ 		{ INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 58500, /* 58.5 Mb */
+-			53500, 0x86, 0x00, 6,
++			53500, 6, 0x00, 6,
+ 			4,  14, 30, 14, 30,  28956 },
+ 		{ INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 65000, /* 65 Mb */
+-			59000, 0x87, 0x00, 7,
++			59000, 7, 0x00, 7,
+ 			4,  15, 31, 15, 32, 32180 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 13000, /* 13 Mb */
+-			12700, 0x88, 0x00,
++			12700, 8, 0x00,
+ 			8, 3, 16, 33, 16, 33, 6430 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 26000, /* 26 Mb */
+-			24800, 0x89, 0x00, 9,
++			24800, 9, 0x00, 9,
+ 			2, 17, 34, 17, 34, 12860 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 39000, /* 39 Mb */
+-			36600, 0x8a, 0x00, 10,
++			36600, 10, 0x00, 10,
+ 			2, 18, 35, 18, 35, 19300 },
+ 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 52000, /* 52 Mb */
+-			48100, 0x8b, 0x00, 11,
++			48100, 11, 0x00, 11,
+ 			4,  19, 36, 19, 36, 25736 },
+ 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 78000, /* 78 Mb */
+-			69500, 0x8c, 0x00, 12,
++			69500, 12, 0x00, 12,
+ 			4,  20, 37, 20, 37, 38600 },
+ 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 104000, /* 104 Mb */
+-			89500, 0x8d, 0x00, 13,
++			89500, 13, 0x00, 13,
+ 			4,  21, 38, 21, 38, 51472 },
+ 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 117000, /* 117 Mb */
+-			98900, 0x8e, 0x00, 14,
++			98900, 14, 0x00, 14,
+ 			4,  22, 39, 22, 39, 57890 },
+ 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 130000, /* 130 Mb */
+-			108300, 0x8f, 0x00, 15,
++			108300, 15, 0x00, 15,
+ 			4,  23, 40, 23, 41, 64320 },
+ 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 13500, /* 13.5 Mb */
+-			13200, 0x80, 0x00, 0,
++			13200, 0, 0x00, 0,
+ 			0, 8, 24, 24, 24, 6684 },
+ 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 27500, /* 27.0 Mb */
+-			25900, 0x81, 0x00, 1,
++			25900, 1, 0x00, 1,
+ 			2, 9, 25, 25, 25, 13368 },
+ 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 40500, /* 40.5 Mb */
+-			38600, 0x82, 0x00, 2,
++			38600, 2, 0x00, 2,
+ 			2, 10, 26, 26, 26, 20052 },
+ 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 54000, /* 54 Mb */
+-			49800, 0x83, 0x00, 3,
++			49800, 3, 0x00, 3,
+ 			4,  11, 27, 27, 27, 26738 },
+ 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 81500, /* 81 Mb */
+-			72200, 0x84, 0x00, 4,
++			72200, 4, 0x00, 4,
+ 			4,  12, 28, 28, 28, 40104 },
+ 		{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 108000, /* 108 Mb */
+-			92900, 0x85, 0x00, 5,
++			92900, 5, 0x00, 5,
+ 			4,  13, 29, 29, 29, 53476 },
+ 		{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 121500, /* 121.5 Mb */
+-			102700, 0x86, 0x00, 6,
++			102700, 6, 0x00, 6,
+ 			4,  14, 30, 30, 30, 60156 },
+ 		{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 135000, /* 135 Mb */
+-			112000, 0x87, 0x00, 7,
++			112000, 7, 0x00, 7,
+ 			4,  15, 31, 32, 32, 66840 },
+ 		{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS_HGI, 150000, /* 150 Mb */
+-			122000, 0x87, 0x00, 7,
++			122000, 7, 0x00, 7,
+ 			4,  15, 31, 32, 32, 74200 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 27000, /* 27 Mb */
+-			25800, 0x88, 0x00, 8,
++			25800, 8, 0x00, 8,
+ 			0, 16, 33, 33, 33, 13360 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 54000, /* 54 Mb */
+-			49800, 0x89, 0x00, 9,
++			49800, 9, 0x00, 9,
+ 			2, 17, 34, 34, 34, 26720 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 81000, /* 81 Mb */
+-			71900, 0x8a, 0x00, 10,
++			71900, 10, 0x00, 10,
+ 			2, 18, 35, 35, 35, 40080 },
+ 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 108000, /* 108 Mb */
+-			92500, 0x8b, 0x00, 11,
++			92500, 11, 0x00, 11,
+ 			4,  19, 36, 36, 36, 53440 },
+ 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 162000, /* 162 Mb */
+-			130300, 0x8c, 0x00, 12,
++			130300, 12, 0x00, 12,
+ 			4,  20, 37, 37, 37, 80160 },
+ 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 216000, /* 216 Mb */
+-			162800, 0x8d, 0x00, 13,
++			162800, 13, 0x00, 13,
+ 			4,  21, 38, 38, 38, 106880 },
+ 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 243000, /* 243 Mb */
+-			178200, 0x8e, 0x00, 14,
++			178200, 14, 0x00, 14,
+ 			4,  22, 39, 39, 39, 120240 },
+ 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 270000, /* 270 Mb */
+-			192100, 0x8f, 0x00, 15,
++			192100, 15, 0x00, 15,
+ 			4,  23, 40, 41, 41, 133600 },
+ 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS_HGI, 300000, /* 300 Mb */
+-			207000, 0x8f, 0x00, 15,
++			207000, 15, 0x00, 15,
+ 			4,  23, 40, 41, 41, 148400 },
+ 	},
+ 	50,  /* probe interval */
+@@ -156,144 +157,145 @@ 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,
-@@ -302,6 +304,7 @@ static const struct ath_rate_table ar541
+-			900, 0x1b, 0x00, 2,
++			900, 0, 0x00, 2,
+ 			0, 0, 0, 0, 0, 0 },
+ 		{ VALID_ALL, VALID_ALL, WLAN_RC_PHY_CCK, 2000, /* 2 Mb */
+-			1900, 0x1a, 0x04, 4,
++			1900, 1, 0x04, 4,
+ 			1, 1, 1, 1, 1, 0 },
+ 		{ VALID_ALL, VALID_ALL, WLAN_RC_PHY_CCK, 5500, /* 5.5 Mb */
+-			4900, 0x19, 0x04, 11,
++			4900, 2, 0x04, 11,
+ 			2, 2, 2, 2, 2, 0 },
+ 		{ VALID_ALL, VALID_ALL, WLAN_RC_PHY_CCK, 11000, /* 11 Mb */
+-			8100, 0x18, 0x04, 22,
++			8100, 3, 0x04, 22,
+ 			3, 3, 3, 3, 3, 0 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
+-			5400, 0x0b, 0x00, 12,
++			5400, 4, 0x00, 12,
+ 			4, 4, 4, 4, 4, 0 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
+-			7800, 0x0f, 0x00, 18,
++			7800, 5, 0x00, 18,
+ 			4, 5, 5, 5, 5, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
+-			10100, 0x0a, 0x00, 24,
++			10100, 6, 0x00, 24,
+ 			6, 6, 6, 6, 6, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
+-			14100,  0x0e, 0x00, 36,
++			14100, 7, 0x00, 36,
+ 			6, 7, 7, 7, 7, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
+-			17700, 0x09, 0x00, 48,
++			17700, 8, 0x00, 48,
+ 			8,  8, 8, 8, 8, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
+-			23700, 0x0d, 0x00, 72,
++			23700, 9, 0x00, 72,
+ 			8,  9, 9, 9, 9, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
+-			27400, 0x08, 0x00, 96,
++			27400, 10, 0x00, 96,
+ 			8,  10, 10, 10, 10, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
+-			30900, 0x0c, 0x00, 108,
++			30900, 11, 0x00, 108,
+ 			8,  11, 11, 11, 11, 0 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_20_SS, 6500, /* 6.5 Mb */
+-			6400, 0x80, 0x00, 0,
++			6400, 0, 0x00, 0,
+ 			4, 12, 28, 12, 28, 3216 },
+ 		{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 13000, /* 13 Mb */
+-			12700, 0x81, 0x00, 1,
++			12700, 1, 0x00, 1,
+ 			6, 13, 29, 13, 29, 6434 },
+ 		{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 19500, /* 19.5 Mb */
+-			18800, 0x82, 0x00, 2,
++			18800, 2, 0x00, 2,
+ 			6, 14, 30, 14, 30, 9650 },
+ 		{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 26000, /* 26 Mb */
+-			25000, 0x83, 0x00, 3,
++			25000, 3, 0x00, 3,
+ 			8,  15, 31, 15, 31, 12868 },
+ 		{ VALID_20, VALID_20, WLAN_RC_PHY_HT_20_SS, 39000, /* 39 Mb */
+-			36700, 0x84, 0x00, 4,
++			36700, 4, 0x00, 4,
+ 			8,  16, 32, 16, 32, 19304 },
+ 		{ INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 52000, /* 52 Mb */
+-			48100, 0x85, 0x00, 5,
++			48100, 5, 0x00, 5,
+ 			8,  17, 33, 17, 33, 25740 },
+ 		{ INVALID,  VALID_20, WLAN_RC_PHY_HT_20_SS, 58500, /* 58.5 Mb */
+-			53500, 0x86, 0x00, 6,
++			53500, 6, 0x00, 6,
+ 			8,  18, 34, 18, 34, 28956 },
+ 		{ INVALID, VALID_20, WLAN_RC_PHY_HT_20_SS, 65000, /* 65 Mb */
+-			59000, 0x87, 0x00, 7,
++			59000, 7, 0x00, 7,
+ 			8,  19, 35, 19, 36, 32180 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 13000, /* 13 Mb */
+-			12700, 0x88, 0x00, 8,
++			12700, 8, 0x00, 8,
+ 			4, 20, 37, 20, 37, 6430 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 26000, /* 26 Mb */
+-			24800, 0x89, 0x00, 9,
++			24800, 9, 0x00, 9,
+ 			6, 21, 38, 21, 38, 12860 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_20_DS, 39000, /* 39 Mb */
+-			36600, 0x8a, 0x00, 10,
++			36600, 10, 0x00, 10,
+ 			6, 22, 39, 22, 39, 19300 },
+ 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 52000, /* 52 Mb */
+-			48100, 0x8b, 0x00, 11,
++			48100, 11, 0x00, 11,
+ 			8,  23, 40, 23, 40, 25736 },
+ 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 78000, /* 78 Mb */
+-			69500, 0x8c, 0x00, 12,
++			69500, 12, 0x00, 12,
+ 			8,  24, 41, 24, 41, 38600 },
+ 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 104000, /* 104 Mb */
+-			89500, 0x8d, 0x00, 13,
++			89500, 13, 0x00, 13,
+ 			8,  25, 42, 25, 42, 51472 },
+ 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 117000, /* 117 Mb */
+-			98900, 0x8e, 0x00, 14,
++			98900, 14, 0x00, 14,
+ 			8,  26, 43, 26, 44, 57890 },
+ 		{ VALID_20, INVALID, WLAN_RC_PHY_HT_20_DS, 130000, /* 130 Mb */
+-			108300, 0x8f, 0x00, 15,
++			108300, 15, 0x00, 15,
+ 			8,  27, 44, 27, 45, 64320 },
+ 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 13500, /* 13.5 Mb */
+-			13200, 0x80, 0x00, 0,
++			13200, 0, 0x00, 0,
+ 			8, 12, 28, 28, 28, 6684 },
+ 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 27500, /* 27.0 Mb */
+-			25900, 0x81, 0x00, 1,
++			25900, 1, 0x00, 1,
+ 			8, 13, 29, 29, 29, 13368 },
+ 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 40500, /* 40.5 Mb */
+-			38600, 0x82, 0x00, 2,
++			38600, 2, 0x00, 2,
+ 			8, 14, 30, 30, 30, 20052 },
+ 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 54000, /* 54 Mb */
+-			49800, 0x83, 0x00, 3,
++			49800, 3, 0x00, 3,
+ 			8,  15, 31, 31, 31, 26738 },
+ 		{ VALID_40, VALID_40, WLAN_RC_PHY_HT_40_SS, 81500, /* 81 Mb */
+-			72200, 0x84, 0x00, 4,
++			72200, 4, 0x00, 4,
+ 			8,  16, 32, 32, 32, 40104 },
+ 		{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 108000, /* 108 Mb */
+-			92900, 0x85, 0x00, 5,
++			92900, 5, 0x00, 5,
+ 			8,  17, 33, 33, 33, 53476 },
+ 		{ INVALID,  VALID_40, WLAN_RC_PHY_HT_40_SS, 121500, /* 121.5 Mb */
+-			102700, 0x86, 0x00, 6,
++			102700, 6, 0x00, 6,
+ 			8,  18, 34, 34, 34, 60156 },
+ 		{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS, 135000, /* 135 Mb */
+-			112000, 0x87, 0x00, 7,
++			112000, 7, 0x00, 7,
+ 			8,  19, 35, 36, 36, 66840 },
+ 		{ INVALID, VALID_40, WLAN_RC_PHY_HT_40_SS_HGI, 150000, /* 150 Mb */
+-			122000, 0x87, 0x00, 7,
++			122000, 7, 0x00, 7,
+ 			8,  19, 35, 36, 36, 74200 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 27000, /* 27 Mb */
+-			25800, 0x88, 0x00, 8,
++			25800, 8, 0x00, 8,
+ 			8, 20, 37, 37, 37, 13360 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 54000, /* 54 Mb */
+-			49800, 0x89, 0x00, 9,
++			49800, 9, 0x00, 9,
+ 			8, 21, 38, 38, 38, 26720 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_HT_40_DS, 81000, /* 81 Mb */
+-			71900, 0x8a, 0x00, 10,
++			71900, 10, 0x00, 10,
+ 			8, 22, 39, 39, 39, 40080 },
+ 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 108000, /* 108 Mb */
+-			92500, 0x8b, 0x00, 11,
++			92500, 11, 0x00, 11,
+ 			8,  23, 40, 40, 40, 53440 },
+ 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 162000, /* 162 Mb */
+-			130300, 0x8c, 0x00, 12,
++			130300, 12, 0x00, 12,
+ 			8,  24, 41, 41, 41, 80160 },
+ 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 216000, /* 216 Mb */
+-			162800, 0x8d, 0x00, 13,
++			162800, 13, 0x00, 13,
+ 			8,  25, 42, 42, 42, 106880 },
+ 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 243000, /* 243 Mb */
+-			178200, 0x8e, 0x00, 14,
++			178200, 14, 0x00, 14,
+ 			8,  26, 43, 43, 43, 120240 },
+ 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS, 270000, /* 270 Mb */
+-			192100, 0x8f, 0x00, 15,
++			192100, 15, 0x00, 15,
+ 			8,  27, 44, 45, 45, 133600 },
+ 		{ VALID_40, INVALID, WLAN_RC_PHY_HT_40_DS_HGI, 300000, /* 300 Mb */
+-			207000, 0x8f, 0x00, 15,
++			207000, 15, 0x00, 15,
+ 			8,  27, 44, 45, 45, 148400 },
+ 		},
+ 	50,  /* probe interval */
+@@ -302,30 +304,31 @@ 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),
-@@ -334,6 +337,7 @@ static const struct ath_rate_table ar541
+-			5400, 0x0b, 0x00, (0x80|12),
++			5400, 0, 0x00, 12,
+ 			0, 0, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
+-			7800, 0x0f, 0x00, 18,
++			7800, 1, 0x00, 18,
+ 			0, 1, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
+-			10000, 0x0a, 0x00, (0x80|24),
++			10000, 2, 0x00, 24,
+ 			2, 2, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
+-			13900, 0x0e, 0x00, 36,
++			13900, 3, 0x00, 36,
+ 			2, 3, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
+-			17300, 0x09, 0x00, (0x80|48),
++			17300, 4, 0x00, 48,
+ 			4,  4, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
+-			23000, 0x0d, 0x00, 72,
++			23000, 5, 0x00, 72,
+ 			4,  5, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
+-			27400, 0x08, 0x00, 96,
++			27400, 6, 0x00, 96,
+ 			4,  6, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
+-			29300, 0x0c, 0x00, 108,
++			29300, 7, 0x00, 108,
+ 			4,  7, 0 },
+ 	},
+ 	50,  /* probe interval */
+@@ -334,48 +337,63 @@ 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,
-@@ -376,6 +380,20 @@ static const struct ath_rate_table ar541
+-			900, 0x1b, 0x00, 2,
++			900, 0, 0x00, 2,
+ 			0, 0, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_CCK, 2000, /* 2 Mb */
+-			1900, 0x1a, 0x04, 4,
++			1900, 1, 0x04, 4,
+ 			1, 1, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_CCK, 5500, /* 5.5 Mb */
+-			4900, 0x19, 0x04, 11,
++			4900, 2, 0x04, 11,
+ 			2, 2, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_CCK, 11000, /* 11 Mb */
+-			8100, 0x18, 0x04, 22,
++			8100, 3, 0x04, 22,
+ 			3, 3, 0 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
+-			5400, 0x0b, 0x00, 12,
++			5400, 4, 0x00, 12,
+ 			4, 4, 0 },
+ 		{ INVALID, INVALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
+-			7800, 0x0f, 0x00, 18,
++			7800, 5, 0x00, 18,
+ 			4, 5, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
+-			10000, 0x0a, 0x00, 24,
++			10000, 6, 0x00, 24,
+ 			6, 6, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
+-			13900, 0x0e, 0x00, 36,
++			13900, 7, 0x00, 36,
+ 			6, 7, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
+-			17300, 0x09, 0x00, 48,
++			17300, 8, 0x00, 48,
+ 			8,  8, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
+-			23000, 0x0d, 0x00, 72,
++			23000, 9, 0x00, 72,
+ 			8,  9, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
+-			27400, 0x08, 0x00, 96,
++			27400, 10, 0x00, 96,
+ 			8,  10, 0 },
+ 		{ VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
+-			29300, 0x0c, 0x00, 108,
++			29300, 11, 0x00, 108,
+ 			8,  11, 0 },
+ 	},
+ 	50,  /* probe interval */
  	0,   /* Phy rates allowed initially */
  };
  
diff --git a/package/mac80211/patches/561-ath9k_rc_table_cleanup.patch b/package/mac80211/patches/561-ath9k_rc_table_cleanup.patch
index 64bf9a6700..30e0f9f0ed 100644
--- a/package/mac80211/patches/561-ath9k_rc_table_cleanup.patch
+++ b/package/mac80211/patches/561-ath9k_rc_table_cleanup.patch
@@ -21,171 +21,171 @@
  	8, /* MCS start */
  	{
  		{ VALID, VALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
--			5400, 0x0b, 0x00, 12,
+-			5400, 0, 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,
+-			7800,  1, 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,
+-			10000, 2, 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,
+-			13900, 3, 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,
+-			17300, 4, 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,
+-			23000, 5, 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,
+-			27400, 6, 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,
+-			29300, 7, 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,
+-			6400, 0, 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,
+-			12700, 1, 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,
+-			18800, 2, 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,
+-			25000, 3, 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,
+-			36700, 4, 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,
+-			48100, 5, 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,
+-			53500, 6, 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,
+-			59000, 7, 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,
+-			12700, 8, 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,
+-			24800, 9, 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,
+-			36600, 10, 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,
+-			48100, 11, 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,
+-			69500, 12, 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,
+-			89500, 13, 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,
+-			98900, 14, 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,
+-			108300, 15, 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,
+-			13200, 0, 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,
+-			25900, 1, 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,
+-			38600, 2, 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,
+-			49800, 3, 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,
+-			72200, 4, 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,
+-			92900, 5, 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,
+-			102700, 6, 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,
+-			112000, 7, 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,
+-			122000, 7, 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,
+-			25800, 8, 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,
+-			49800, 9, 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,
+-			71900, 10, 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,
+-			92500, 11, 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,
+-			130300, 12, 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,
+-			162800, 13, 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,
+-			178200, 14, 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,
+-			192100, 15, 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,
+-			207000, 15, 0x00, 15,
 -			4,  23, 40, 41, 41, 148400 },
 +			207000, 15, 15, 4, 23, 40, 41, 41 },
  	},
@@ -195,187 +195,187 @@
  	12, /* MCS start */
  	{
  		{ VALID_ALL, VALID_ALL, WLAN_RC_PHY_CCK, 1000, /* 1 Mb */
--			900, 0x1b, 0x00, 2,
+-			900, 0, 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,
+-			1900, 1, 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,
+-			4900, 2, 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,
+-			8100, 3, 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,
+-			5400, 4, 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,
+-			7800, 5, 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,
+-			10100, 6, 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,
+-			14100, 7, 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,
+-			17700, 8, 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,
+-			23700, 9, 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,
+-			27400, 10, 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,
+-			30900, 11, 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,
+-			6400, 0, 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,
+-			12700, 1, 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,
+-			18800, 2, 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,
+-			25000, 3, 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,
+-			36700, 4, 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,
+-			48100, 5, 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,
+-			53500, 6, 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,
+-			59000, 7, 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,
+-			12700, 8, 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,
+-			24800, 9, 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,
+-			36600, 10, 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,
+-			48100, 11, 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,
+-			69500, 12, 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,
+-			89500, 13, 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,
+-			98900, 14, 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,
+-			108300, 15, 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,
+-			13200, 0, 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,
+-			25900, 1, 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,
+-			38600, 2, 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,
+-			49800, 3, 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,
+-			72200, 4, 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,
+-			92900, 5, 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,
+-			102700, 6, 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,
+-			112000, 7, 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,
+-			122000, 7, 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,
+-			25800, 8, 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,
+-			49800, 9, 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,
+-			71900, 10, 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,
+-			92500, 11, 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,
+-			130300, 12, 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,
+-			162800, 13, 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,
+-			178200, 14, 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,
+-			192100, 15, 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,
+-			207000, 15, 0x00, 15,
 -			8,  27, 44, 45, 45, 148400 },
 -		},
 +			207000, 15, 15, 8, 27, 44, 45, 45 },
@@ -387,35 +387,35 @@
  	0,
  	{
  		{ VALID, VALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
--			5400, 0x0b, 0x00, (0x80|12),
+-			5400, 0, 0x00, 12,
 -			0, 0, 0 },
 +			5400, 0, 12, 0, 0, 0 },
  		{ VALID, VALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
--			7800, 0x0f, 0x00, 18,
+-			7800, 1, 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),
+-			10000, 2, 0x00, 24,
 -			2, 2, 0 },
 +			10000, 2, 24, 2, 2, 0 },
  		{ VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
--			13900, 0x0e, 0x00, 36,
+-			13900, 3, 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),
+-			17300, 4, 0x00, 48,
 -			4,  4, 0 },
 +			17300, 4, 48, 4, 4, 0 },
  		{ VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
--			23000, 0x0d, 0x00, 72,
+-			23000, 5, 0x00, 72,
 -			4,  5, 0 },
 +			23000, 5, 72, 4, 5, 0 },
  		{ VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
--			27400, 0x08, 0x00, 96,
+-			27400, 6, 0x00, 96,
 -			4,  6, 0 },
 +			27400, 6, 96, 4, 6, 0 },
  		{ VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
--			29300, 0x0c, 0x00, 108,
+-			29300, 7, 0x00, 108,
 -			4,  7, 0 },
 +			29300, 7, 108, 4, 7, 0 },
  	},
@@ -425,51 +425,51 @@
  	0,
  	{
  		{ VALID, VALID, WLAN_RC_PHY_CCK, 1000, /* 1 Mb */
--			900, 0x1b, 0x00, 2,
+-			900, 0, 0x00, 2,
 -			0, 0, 0 },
 +			900, 0, 2, 0, 0, 0 },
  		{ VALID, VALID, WLAN_RC_PHY_CCK, 2000, /* 2 Mb */
--			1900, 0x1a, 0x04, 4,
+-			1900, 1, 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,
+-			4900, 2, 0x04, 11,
 -			2, 2, 0 },
 +			4900, 2, 11, 2, 2, 0 },
  		{ VALID, VALID, WLAN_RC_PHY_CCK, 11000, /* 11 Mb */
--			8100, 0x18, 0x04, 22,
+-			8100, 3, 0x04, 22,
 -			3, 3, 0 },
 +			8100, 3, 22, 3, 3, 0 },
  		{ INVALID, INVALID, WLAN_RC_PHY_OFDM, 6000, /* 6 Mb */
--			5400, 0x0b, 0x00, 12,
+-			5400, 4, 0x00, 12,
 -			4, 4, 0 },
 +			5400, 4, 12, 4, 4, 0 },
  		{ INVALID, INVALID, WLAN_RC_PHY_OFDM, 9000, /* 9 Mb */
--			7800, 0x0f, 0x00, 18,
+-			7800, 5, 0x00, 18,
 -			4, 5, 0 },
 +			7800, 5, 18, 4, 5, 0 },
  		{ VALID, VALID, WLAN_RC_PHY_OFDM, 12000, /* 12 Mb */
--			10000, 0x0a, 0x00, 24,
+-			10000, 6, 0x00, 24,
 -			6, 6, 0 },
 +			10000, 6, 24, 6, 6, 0 },
  		{ VALID, VALID, WLAN_RC_PHY_OFDM, 18000, /* 18 Mb */
--			13900, 0x0e, 0x00, 36,
+-			13900, 7, 0x00, 36,
 -			6, 7, 0 },
 +			13900, 7, 36, 6, 7, 0 },
  		{ VALID, VALID, WLAN_RC_PHY_OFDM, 24000, /* 24 Mb */
--			17300, 0x09, 0x00, 48,
+-			17300, 8, 0x00, 48,
 -			8,  8, 0 },
 +			17300, 8, 48, 8, 8, 0 },
  		{ VALID, VALID, WLAN_RC_PHY_OFDM, 36000, /* 36 Mb */
--			23000, 0x0d, 0x00, 72,
+-			23000, 9, 0x00, 72,
 -			8,  9, 0 },
 +			23000, 9, 72, 8, 9, 0 },
  		{ VALID, VALID, WLAN_RC_PHY_OFDM, 48000, /* 48 Mb */
--			27400, 0x08, 0x00, 96,
+-			27400, 10, 0x00, 96,
 -			8,  10, 0 },
 +			27400, 10, 96, 8, 10, 0 },
  		{ VALID, VALID, WLAN_RC_PHY_OFDM, 54000, /* 54 Mb */
--			29300, 0x0c, 0x00, 108,
+-			29300, 11, 0x00, 108,
 -			8,  11, 0 },
 +			29300, 11, 108, 8, 11, 0 },
  	},