diff options
| author | sam <sam@FreeBSD.org> | 2004-12-31 21:09:43 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2004-12-31 21:09:43 +0000 |
| commit | f249744499e32e4b6258162be44949007d88510f (patch) | |
| tree | 9ac50c9bf95171089225cd28f95b3b8f9d2e2089 /sys/net80211 | |
| parent | 59c07f15bb520dacfe768cbfb45aca96a6637a32 (diff) | |
| download | FreeBSD-src-f249744499e32e4b6258162be44949007d88510f.zip FreeBSD-src-f249744499e32e4b6258162be44949007d88510f.tar.gz | |
change ieee80211_parse_wmeparams to return a unique value when the ie
is invalid so we can distinguish this from needing a parameter update;
fixes dynamic update of wme parameters
Diffstat (limited to 'sys/net80211')
| -rw-r--r-- | sys/net80211/ieee80211_input.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index d73c419..6ed6c36 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -1589,7 +1589,7 @@ ieee80211_parse_wmeparams(struct ieee80211com *ic, u_int8_t *frm, IEEE80211_DISCARD_IE(ic, IEEE80211_MSG_ELEMID | IEEE80211_MSG_WME, wh, "WME", "too short, len %u", len); - return 0; + return -1; } qosinfo = frm[__offsetof(struct ieee80211_wme_param, param_qosInfo)]; qosinfo &= WME_QOSINFO_COUNT; @@ -1868,7 +1868,7 @@ ieee80211_recv_mgmt(struct ieee80211com *ic, struct mbuf *m0, /* XXX statistic */ } if (wme != NULL && - ieee80211_parse_wmeparams(ic, wme, wh)) + ieee80211_parse_wmeparams(ic, wme, wh) > 0) ieee80211_wme_updateparams(ic); /* NB: don't need the rest of this */ return; @@ -2356,7 +2356,8 @@ ieee80211_recv_mgmt(struct ieee80211com *ic, struct mbuf *m0, ni->ni_capinfo = capinfo; ni->ni_associd = associd; - if (wme != NULL && ieee80211_parse_wmeparams(ic, wme, wh)) { + if (wme != NULL && + ieee80211_parse_wmeparams(ic, wme, wh) >= 0) { ni->ni_flags |= IEEE80211_NODE_QOS; ieee80211_wme_updateparams(ic); } else |
