*** ./net/mac80211/rc80211_minstrel.c.dist	Tue Feb  9 21:07:02 2010
--- ./net/mac80211/rc80211_minstrel.c	Tue Feb  9 21:08:09 2010
***************
*** 222,232 ****
  minstrel_get_next_sample(struct minstrel_sta_info *mi)
  {
  	unsigned int sample_ndx;
  	sample_ndx = SAMPLE_TBL(mi, mi->sample_idx, mi->sample_column);
  	mi->sample_idx++;
! 	if (mi->sample_idx > (mi->n_rates - 2)) {
  		mi->sample_idx = 0;
  		mi->sample_column++;
  		if (mi->sample_column >= SAMPLE_COLUMNS)
  			mi->sample_column = 0;
  	}
--- 222,232 ----
  minstrel_get_next_sample(struct minstrel_sta_info *mi)
  {
  	unsigned int sample_ndx;
  	sample_ndx = SAMPLE_TBL(mi, mi->sample_idx, mi->sample_column);
  	mi->sample_idx++;
! 	if (mi->n_rates == 1 || mi->sample_idx > (mi->n_rates - 2)) {
  		mi->sample_idx = 0;
  		mi->sample_column++;
  		if (mi->sample_column >= SAMPLE_COLUMNS)
  			mi->sample_column = 0;
  	}