summaryrefslogtreecommitdiffstats
path: root/sys/net80211/ieee80211_node.c
diff options
context:
space:
mode:
authorbschmidt <bschmidt@FreeBSD.org>2010-08-21 11:06:21 +0000
committerbschmidt <bschmidt@FreeBSD.org>2010-08-21 11:06:21 +0000
commitf75ce6f82b84f164dedf711f23241eec9a847594 (patch)
tree16e1024b68ff4e92e1eb4a67be339ff3f2016558 /sys/net80211/ieee80211_node.c
parent210576ca5a962e6c85432a934d55cc531b8d4de0 (diff)
downloadFreeBSD-src-f75ce6f82b84f164dedf711f23241eec9a847594.zip
FreeBSD-src-f75ce6f82b84f164dedf711f23241eec9a847594.tar.gz
Wrap remaining ieee80211_ratectl_node_init() calls missed in r211314.
MFC after: 1 week
Diffstat (limited to 'sys/net80211/ieee80211_node.c')
-rw-r--r--sys/net80211/ieee80211_node.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c
index e3c2769..2dc4871 100644
--- a/sys/net80211/ieee80211_node.c
+++ b/sys/net80211/ieee80211_node.c
@@ -1404,7 +1404,8 @@ ieee80211_fakeup_adhoc_node(struct ieee80211vap *vap,
#endif
}
ieee80211_node_setuptxparms(ni);
- ieee80211_ratectl_node_init(ni);
+ if (vap->iv_caps & IEEE80211_C_RATECTL)
+ ieee80211_ratectl_node_init(ni);
if (ic->ic_newassoc != NULL)
ic->ic_newassoc(ni, 1);
/* XXX not right for 802.1x/WPA */
@@ -1474,7 +1475,8 @@ ieee80211_add_neighbor(struct ieee80211vap *vap,
if (ieee80211_iserp_rateset(&ni->ni_rates))
ni->ni_flags |= IEEE80211_NODE_ERP;
ieee80211_node_setuptxparms(ni);
- ieee80211_ratectl_node_init(ni);
+ if (vap->iv_caps & IEEE80211_C_RATECTL)
+ ieee80211_ratectl_node_init(ni);
if (ic->ic_newassoc != NULL)
ic->ic_newassoc(ni, 1);
/* XXX not right for 802.1x/WPA */
@@ -2343,7 +2345,8 @@ ieee80211_node_join(struct ieee80211_node *ni, int resp)
);
ieee80211_node_setuptxparms(ni);
- ieee80211_ratectl_node_init(ni);
+ if (vap->iv_caps & IEEE80211_C_RATECTL)
+ ieee80211_ratectl_node_init(ni);
/* give driver a chance to setup state like ni_txrate */
if (ic->ic_newassoc != NULL)
ic->ic_newassoc(ni, newassoc);
OpenPOWER on IntegriCloud