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_sta.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_sta.c')
| -rw-r--r-- | sys/net80211/ieee80211_sta.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/net80211/ieee80211_sta.c b/sys/net80211/ieee80211_sta.c index 5764fa0..f93c3ed 100644 --- a/sys/net80211/ieee80211_sta.c +++ b/sys/net80211/ieee80211_sta.c @@ -1597,8 +1597,7 @@ sta_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, IEEE80211_F_JOIN | IEEE80211_F_DOBRS); ieee80211_setup_basic_htrates(ni, htinfo); ieee80211_node_setuptxparms(ni); - if (vap->iv_caps & IEEE80211_C_RATECTL) - ieee80211_ratectl_node_init(ni); + ieee80211_ratectl_node_init(ni); } else { #ifdef IEEE80211_SUPPORT_SUPERG if (IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_ATH)) |
