summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorDamien Bergamini <damien@cvs.openbsd.org>2007-07-05 21:35:46 +0000
committerDamien Bergamini <damien@cvs.openbsd.org>2007-07-05 21:35:46 +0000
commit1a2a95336972384f6c0cd859edef9012486ae79e (patch)
tree54bc31ba78f0f0c5afdcb2f954f5cb63ca66ea57 /sys
parent22279cde09f9db8183b3844d1c8edadbc04ad9a5 (diff)
always set the IEEE80211_CAPINFO_ESS bit in association requests.
fixes my 1.36 commit (the bit should not be set for non-AP STA only in Probe Responses and Beacons).
Diffstat (limited to 'sys')
-rw-r--r--sys/net80211/ieee80211_output.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c
index 9a7eac7895b..08b2c2832f4 100644
--- a/sys/net80211/ieee80211_output.c
+++ b/sys/net80211/ieee80211_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_output.c,v 1.42 2007/07/05 20:29:22 damien Exp $ */
+/* $OpenBSD: ieee80211_output.c,v 1.43 2007/07/05 21:35:45 damien Exp $ */
/* $NetBSD: ieee80211_output.c,v 1.13 2004/05/31 11:02:55 dyoung Exp $ */
/*-
@@ -1181,12 +1181,7 @@ ieee80211_get_assoc_req(struct ieee80211com *ic, struct ieee80211_node *ni,
m->m_data += sizeof(struct ieee80211_frame);
frm = mtod(m, u_int8_t *);
- if (ic->ic_opmode == IEEE80211_M_IBSS)
- capinfo = IEEE80211_CAPINFO_IBSS;
- else if (ic->ic_opmode == IEEE80211_M_HOSTAP)
- capinfo = IEEE80211_CAPINFO_ESS;
- else
- capinfo = 0;
+ capinfo = IEEE80211_CAPINFO_ESS;
if (ic->ic_flags & IEEE80211_F_WEPON)
capinfo |= IEEE80211_CAPINFO_PRIVACY;
/*