mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-28 11:57:28 +00:00
Code Issues Releases Activity

Add in some debugging code to check whether the current rate table has

Browse Source 
been bait-and-switched from the rate control code.

This will avoid the panic that I saw and will avoid sending invalid rates
(eg 11a/11g OFDM rates when in 11b, on 11b-only NICs (AR5211)) where the
rate table is not "big".

It also will point out situations where this occurs for the 11n NICs
which will have sufficiently large rate tables that "invalid rix" doesn't
occur.

I'll try to follow this up with a commit that adds a current operating mode
check. The "rix" is only relevant to the current operating mode and rate
table.

PR:	kern/165475
This commit is contained in:
Adrian Chadd 2012-02-26 06:04:44 +00:00
parent f9230ad6b8
commit cc86f1ea4d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=232170
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/dev/ath/ath_rate/sample/sample.c
View File

@ -495,6 +495,14 @@ ath_rate_findrate(struct ath_softc *sc, struct ath_node *an,
ath_rate_update_static_rix(sc, &an->an_node);
if (sn->currates != sc->sc_currates) {
device_printf(sc->sc_dev, "%s: currates != sc_currates!\n",
__func__);
rix = 0;
*try0 = ATH_TXMAXTRY;
goto done;
}
if (sn->static_rix != -1) {
rix = sn->static_rix;
*try0 = ATH_TXMAXTRY;
@ -621,6 +629,20 @@ ath_rate_findrate(struct ath_softc *sc, struct ath_node *an,
}
*try0 = mrr ? sn->sched[rix].t0 : ATH_TXMAXTRY;
done:
/*
* This bug totally sucks and should be fixed.
*
* For now though, let's not panic, so we can start to figure
* out how to better reproduce it.
*/
if (rix < 0 || rix >= rt->rateCount) {
printf("%s: ERROR: rix %d out of bounds (rateCount=%d)\n",
__func__,
rix,
rt->rateCount);
rix = 0; /* XXX just default for now */
}
KASSERT(rix >= 0 && rix < rt->rateCount, ("rix is %d", rix));
*rix0 = rix;
@ -1073,6 +1095,8 @@ ath_rate_ctl_reset(struct ath_softc *sc, struct ieee80211_node *ni)
sn->static_rix = -1;
ath_rate_update_static_rix(sc, ni);
sn->currates = sc->sc_currates;
/*
* Construct a bitmask of usable rates. This has all
* negotiated rates minus those marked by the hal as

2
sys/dev/ath/ath_rate/sample/sample.h
View File

@ -86,6 +86,8 @@ struct sample_node {
uint32_t ratemask; /* bit mask of valid rate indices */
const struct txschedule *sched; /* tx schedule table */
const HAL_RATE_TABLE *currates;
struct rate_stats stats[NUM_PACKET_SIZE_BINS][SAMPLE_MAXRATES];
int last_sample_rix[NUM_PACKET_SIZE_BINS];