diff options
| author | sam <sam@FreeBSD.org> | 2007-03-11 07:22:21 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2007-03-11 07:22:21 +0000 |
| commit | 63f1cc9c738cf124815b9f2b3c983f6c212a9715 (patch) | |
| tree | 62a74870d86a2e134567630ca296bacbe0a35ffe /sys/net80211/ieee80211_node.c | |
| parent | a0ffc0834867892a7aace699b65132a9ee33110d (diff) | |
| download | FreeBSD-src-63f1cc9c738cf124815b9f2b3c983f6c212a9715.zip FreeBSD-src-63f1cc9c738cf124815b9f2b3c983f6c212a9715.tar.gz | |
change ieee80211_fix_rate to take a rate set instead of using
ni_rates; this lets us re-use the code to check 11n HT rates
MFC after: 2 weeks
Diffstat (limited to 'sys/net80211/ieee80211_node.c')
| -rw-r--r-- | sys/net80211/ieee80211_node.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index 0408c33..eb30e62 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -513,7 +513,7 @@ ieee80211_match_bss(struct ieee80211com *ic, struct ieee80211_node *ni) if (ni->ni_capinfo & IEEE80211_CAPINFO_PRIVACY) fail |= 0x04; } - rate = ieee80211_fix_rate(ni, + rate = ieee80211_fix_rate(ni, &ni->ni_rates, IEEE80211_F_JOIN | IEEE80211_F_DONEGO | IEEE80211_F_DOFRATE); if (rate & IEEE80211_RATE_BASIC) fail |= 0x08; @@ -825,7 +825,8 @@ ieee80211_sta_join(struct ieee80211com *ic, struct ieee80211_node *selbs) * Delete unusable rates; we've already checked * that the negotiated rate set is acceptable. */ - ieee80211_fix_rate(ic->ic_bss, IEEE80211_F_DODEL | IEEE80211_F_JOIN); + ieee80211_fix_rate(ic->ic_bss, &ic->ic_bss->ni_rates, + IEEE80211_F_DODEL | IEEE80211_F_JOIN); /* * Set the erp state (mostly the slot time) to deal with |
