Index: madwifi-ng-r2420-20070602/ath_rate/minstrel/minstrel.c
===================================================================
--- madwifi-ng-r2420-20070602.orig/ath_rate/minstrel/minstrel.c	2007-06-04 13:21:55.198585208 +0200
+++ madwifi-ng-r2420-20070602/ath_rate/minstrel/minstrel.c	2007-06-04 13:21:57.115293824 +0200
@@ -358,6 +358,8 @@
 					if (sn->rs_sampleColumn >= MINSTREL_COLUMNS)
 						sn->rs_sampleColumn = 0;
 				}
+				if (ndx < sn->max_prob_rate - 2)
+					ndx = sn->max_tp_rate;
 			} else
 				ndx = sn->max_tp_rate;
 		 }