Author: bschmidt
Date: Sat Aug 21 11:06:21 2010
New Revision: 211546
URL: http://svn.freebsd.org/changeset/base/211546
Log:
Wrap remaining ieee80211_ratectl_node_init() calls missed in r211314.
MFC after: 1 week
Modified:
head/sys/net80211/ieee80211_node.c
Modified: head/sys/net80211/ieee80211_node.c
==============================================================================
--- head/sys/net80211/ieee80211_node.c Sat Aug 21 11:04:38 2010
(r211545)
+++ head/sys/net80211/ieee80211_node.c Sat Aug 21 11:06:21 2010
(r211546)
@@ -1404,7 +1404,8 @@ ieee80211_fakeup_adhoc_node(struct ieee8
#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 ieee80211v
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_nod
);
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);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
