diff options
| author | bschmidt <bschmidt@FreeBSD.org> | 2010-11-06 18:17:20 +0000 |
|---|---|---|
| committer | bschmidt <bschmidt@FreeBSD.org> | 2010-11-06 18:17:20 +0000 |
| commit | 5fd0b74a4c9151f623761f2b995f59a8e38f320e (patch) | |
| tree | f42f8a30c64758aa2079a7c3a4a5e7918cc53978 /sys/net80211/ieee80211.c | |
| parent | b57486d5506289777c9643799c4c259be8ed5f5e (diff) | |
| download | FreeBSD-src-5fd0b74a4c9151f623761f2b995f59a8e38f320e.zip FreeBSD-src-5fd0b74a4c9151f623761f2b995f59a8e38f320e.tar.gz | |
Instead of using the AMRR ratectl algo as default for drivers which have
the IEEE80211_C_RATECTL flag set, default to NONE for all drivers. Only if
a driver calls ieee80211_ratectl_init() check if the NONE algo is still
selected and try to use AMRR in that case. Drivers are still free to use
any other algo by calling ieee80211_ratectl_set() prior to the
ieee80211_ratectl_init() call.
After this change it is now safe to assume that a ratectl algo is always
available and selected, which renders the IEEE80211_C_RATECTL flag pretty
much useless. Therefore revert r211314 and 211546.
Reviewed by: rpaulo
MFC after: 2 weeks
Diffstat (limited to 'sys/net80211/ieee80211.c')
| -rw-r--r-- | sys/net80211/ieee80211.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c index 6848824..409cf1d 100644 --- a/sys/net80211/ieee80211.c +++ b/sys/net80211/ieee80211.c @@ -486,9 +486,7 @@ ieee80211_vap_setup(struct ieee80211com *ic, struct ieee80211vap *vap, ieee80211_scan_vattach(vap); ieee80211_regdomain_vattach(vap); ieee80211_radiotap_vattach(vap); - - if (vap->iv_caps & IEEE80211_C_RATECTL) - ieee80211_ratectl_set(vap, IEEE80211_RATECTL_AMRR); + ieee80211_ratectl_set(vap, IEEE80211_RATECTL_NONE); return 0; } |
