From 6aa57182d3eb9bfe5743d402c240a2aa329927ff Mon Sep 17 00:00:00 2001 From: Sam Leffler Date: Tue, 7 Jun 2005 00:08:48 +0000 Subject: WPA/802.11i interoperability fixes: o only include capabilities word in the WPA ie when non-zero and not preauth o always include the capabilities in the RSN ie Obtained from: Atheros --- sys/net80211/ieee80211_output.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index 3f7bfeb6c10fc..b0fa613216a2f 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -728,7 +728,7 @@ ieee80211_setup_wpa_ie(struct ieee80211com *ic, u_int8_t *ie) } /* optional capabilities */ - if (rsn->rsn_caps != 0) + if (rsn->rsn_caps != 0 && rsn->rsn_caps != RSN_CAP_PREAUTH) ADDSHORT(frm, rsn->rsn_caps); /* calculate element length */ @@ -811,8 +811,7 @@ ieee80211_setup_rsn_ie(struct ieee80211com *ic, u_int8_t *ie) } /* optional capabilities */ - if (rsn->rsn_caps != 0) - ADDSHORT(frm, rsn->rsn_caps); + ADDSHORT(frm, rsn->rsn_caps); /* XXX PMKID */ /* calculate element length */ -- cgit v1.3