svn commit: r347141 - head/sys/dev/ath/ath_rate/sample

[Adrian Chadd]

Author: adrian
Date: Sun May  5 06:32:40 2019
New Revision: 347141
URL: https://svnweb.freebsd.org/changeset/base/347141

Log:
  [ath_rate_sample] Have the final attempted rate in 11n modes to be the lowest one.
  
  Right now ath_rate_sample has a fixed rate schedule, rather than the minstrel_ht
  style "best, good, most reliable" triplet.  So, if higher rates are tried then
  it'll not fail back to a lower MCS rate in that transmission schedule.
  
  This means that in low SNR situations it'll not easily drop to MCS0 unless enough
  transmissions occur to allow rate control to eventually decide to drop; and if
  it's TCP traffic it'll get slowed down because of packet loss.
  
  It's worse for 2-stream and 3-stream rates; it doesn't ever fall back to lower
  stream rates, and these higher stream rates required higher SNR to work.
  
  So instead let's (for now?) have each of the 11n transmit rates use MCS0 as
  the last attempt. ath_rate_sample will quickly see that rate succeeds more
  and will move to it much quicker.
  
  Testing:
  
  * AR9344 (Wasp) - 2G STA mode

Modified:
  head/sys/dev/ath/ath_rate/sample/tx_schedules.h

Modified: head/sys/dev/ath/ath_rate/sample/tx_schedules.h
==============================================================================
--- head/sys/dev/ath/ath_rate/sample/tx_schedules.h	Sun May  5 04:56:37 2019	(r347140)
+++ head/sys/dev/ath/ath_rate/sample/tx_schedules.h	Sun May  5 06:32:40 2019	(r347141)
@@ -172,30 +172,30 @@ static const struct txschedule series_11ng[] = {
 	{ 4,NG1(  26), 3,NG1(19.5), 4,NG1( 6.5), 2,NG1(6.5) },  /*  26Mb/s */
 	{ 4,NG1(  39), 3,NG1(  26), 4,NG1(19.5), 2,NG1(6.5) },  /*  39Mb/s */
 	{ 4,NG1(  52), 3,NG1(  39), 4,NG1(  26), 2,NG1(6.5) },  /*  52Mb/s */
-	{ 4,NG1(58.5), 3,NG1(  52), 4,NG1(  39), 2,NG1( 13) },  /*58.5Mb/s */
-	{ 4,NG1(  65), 3,NG1(58.5), 4,NG1(  52), 2,NG1( 13) },  /*  65Mb/s */
+	{ 4,NG1(58.5), 3,NG1(  52), 4,NG1(  39), 2,NG1(6.5) },  /*58.5Mb/s */
+	{ 4,NG1(  65), 3,NG1(58.5), 4,NG1(  52), 2,NG1(6.5) },  /*  65Mb/s */
 
 	/* 2 stream rates */
 
-	{ 3,NG2(  13), 3,NG2(  13), 0,NG2(  13), 0,NG2( 13) },  /*  13Mb/s */
-	{ 4,NG2(  26), 3,NG2(  13), 4,NG2(  13), 0,NG2( 13) },  /*  26Mb/s */
-	{ 4,NG2(  39), 3,NG2(  26), 4,NG2(  13), 2,NG2( 13) },  /*  39Mb/s */
-	{ 4,NG2(  52), 3,NG2(  39), 4,NG2(  26), 2,NG2( 13) },  /*  52Mb/s */
-	{ 4,NG2(  78), 3,NG2(  52), 4,NG2(  39), 2,NG2( 13) },  /*  78Mb/s */
-	{ 4,NG2( 104), 3,NG2(  78), 4,NG2(  52), 2,NG2( 13) },  /* 104Mb/s */
-	{ 4,NG2( 117), 3,NG2( 104), 4,NG2(  78), 2,NG2( 26) },  /* 117Mb/s */
-	{ 4,NG2( 130), 3,NG2( 117), 4,NG2( 104), 2,NG2( 26) },  /* 130Mb/s */
+	{ 3,NG2(  13), 3,NG1(6.5), 0,NG2(  13), 0,NG2( 13) },  /*  13Mb/s */
+	{ 4,NG2(  26), 3,NG2(  13), 4,NG1(6.5), 0,NG2( 13) },  /*  26Mb/s */
+	{ 4,NG2(  39), 3,NG2(  26), 4,NG2(  13), 2,NG1(6.5) },  /*  39Mb/s */
+	{ 4,NG2(  52), 3,NG2(  39), 4,NG2(  26), 2,NG1(6.5) },  /*  52Mb/s */
+	{ 4,NG2(  78), 3,NG2(  52), 4,NG2(  39), 2,NG1(6.5) },  /*  78Mb/s */
+	{ 4,NG2( 104), 3,NG2(  78), 4,NG2(  52), 2,NG1(6.5) },  /* 104Mb/s */
+	{ 4,NG2( 117), 3,NG2( 104), 4,NG2(  78), 2,NG1(6.5) },  /* 117Mb/s */
+	{ 4,NG2( 130), 3,NG2( 117), 4,NG2( 104), 2,NG1(6.5) },  /* 130Mb/s */
 
 	/* 3 stream rates */
 
-	{ 3,NG3(19.5), 3,NG3(19.5), 0,NG3(19.5), 0,NG3(19.5) },  /*  19Mb/s */
-	{ 3,NG3(  39), 3,NG3(19.5), 0,NG3(19.5), 0,NG3(19.5) },  /*  39Mb/s */
-	{ 3,NG3(58.5), 3,NG3(  39), 0,NG3(19.5), 0,NG3(19.5) },  /*  58Mb/s */
-	{ 3,NG3(  78), 3,NG3(58.5), 0,NG3(  39), 0,NG3(19.5) },  /*  78Mb/s */
-	{ 3,NG3( 117), 3,NG3(  78), 0,NG3(58.5), 0,NG3(19.5) },  /* 117Mb/s */
-	{ 3,NG3( 156), 3,NG3( 117), 0,NG3(  78), 0,NG3(19.5) },  /*  156Mb/s */
-	{ 3,NG3(175.5), 3,NG3( 156), 0,NG3( 117), 0,NG3(  39) },  /*  175Mb/s */
-	{ 3,NG3( 195), 3,NG3( 195), 0,NG3( 156), 0,NG3(58.5) },  /* 195Mb/s */
+	{ 3,NG3(19.5), 3,NG1(6.5), 0,NG3(19.5), 0,NG3(19.5) },  /*  19Mb/s */
+	{ 3,NG3(  39), 3,NG3(19.5), 4,NG1(6.5), 0,NG3(19.5) },  /*  39Mb/s */
+	{ 3,NG3(58.5), 3,NG3(  39), 4,NG1(6.5), 0,NG3(19.5) },  /*  58Mb/s */
+	{ 3,NG3(  78), 3,NG3(58.5), 4,NG1(6.5), 0,NG3(19.5) },  /*  78Mb/s */
+	{ 3,NG3( 117), 3,NG3(  78), 4,NG1(6.5), 0,NG3(19.5) },  /* 117Mb/s */
+	{ 3,NG3( 156), 3,NG3( 117), 4,NG1(6.5), 0,NG3(19.5) },  /*  156Mb/s */
+	{ 3,NG3(175.5), 3,NG3( 156), 4,NG1(6.5), 0,NG3(  39) },  /*  175Mb/s */
+	{ 3,NG3( 195), 3,NG3( 195), 4,NG1(6.5), 0,NG3(58.5) },  /* 195Mb/s */
 
 };
 #undef G