View | Details | Raw Unified | Return to bug 13000
Collapse All | Expand All

(-)a/net/mac80211/rc80211_minstrel.c (-1 / +10 lines)
Lines 181-186 minstrel_tx_status(void *priv, struct ieee80211_supported_band *sband, Link Here
181
		if (ar[i].idx < 0)
181
		if (ar[i].idx < 0)
182
			break;
182
			break;
183
183
184
		if (WARN(ar[i].idx >= mi->n_rates,
185
		    "minstrel: invalid rate report %d (n=%d)\n",
186
		    ar[i].idx, mi->n_rates))
187
			break;
188
184
		ndx = rix_to_ndx(mi, ar[i].idx);
189
		ndx = rix_to_ndx(mi, ar[i].idx);
185
		mi->r[ndx].attempts += ar[i].count;
190
		mi->r[ndx].attempts += ar[i].count;
186
191
Lines 328-334 minstrel_get_rate(void *priv, struct ieee80211_sta *sta, Link Here
328
			ar[0].count = mp->max_retry;
333
			ar[0].count = mp->max_retry;
329
		ar[1].idx = mi->lowest_rix;
334
		ar[1].idx = mi->lowest_rix;
330
		ar[1].count = mp->max_retry;
335
		ar[1].count = mp->max_retry;
331
		return;
336
		goto done;
332
	}
337
	}
333
338
334
	/* MRR setup */
339
	/* MRR setup */
Lines 346-351 minstrel_get_rate(void *priv, struct ieee80211_sta *sta, Link Here
346
		ar[i].idx = mi->r[mrr_ndx[i - 1]].rix;
351
		ar[i].idx = mi->r[mrr_ndx[i - 1]].rix;
347
		ar[i].count = mi->r[mrr_ndx[i - 1]].adjusted_retry_count;
352
		ar[i].count = mi->r[mrr_ndx[i - 1]].adjusted_retry_count;
348
	}
353
	}
354
355
done:
356
	if (WARN_ON(ar[0].idx < 0))
357
		ar[0].idx = rate_lowest_index(sband, sta);
349
}
358
}
350
359
351
360

Return to bug 13000