summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Bergamini <damien@cvs.openbsd.org>2007-07-05 21:38:20 +0000
committerDamien Bergamini <damien@cvs.openbsd.org>2007-07-05 21:38:20 +0000
commitb2f7393fcddc41dac2563860631ed8c4cee67015 (patch)
tree091cf24796f35b94e4f3800ac639fc42c5769e9e
parent1a2a95336972384f6c0cd859edef9012486ae79e (diff)
fixes my previous commit.
the ESS bit must be set in (re)assocation requests.
-rw-r--r--sys/dev/pci/if_iwi.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c
index d090a94f063..f67d8688e27 100644
--- a/sys/dev/pci/if_iwi.c
+++ b/sys/dev/pci/if_iwi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_iwi.c,v 1.80 2007/07/05 20:31:38 damien Exp $ */
+/* $OpenBSD: if_iwi.c,v 1.81 2007/07/05 21:38:19 damien Exp $ */
/*-
* Copyright (c) 2004-2006
@@ -2092,10 +2092,7 @@ iwi_auth_and_assoc(struct iwi_softc *sc)
if (ic->ic_flags & IEEE80211_F_SHPREAMBLE)
assoc.plen = IWI_ASSOC_SHPREAMBLE;
bcopy(ni->ni_tstamp, assoc.tstamp, 8);
- if (ic->ic_opmode == IEEE80211_M_IBSS)
- capinfo = IEEE80211_CAPINFO_IBSS;
- else
- capinfo = 0;
+ capinfo = IEEE80211_CAPINFO_ESS;
if (ic->ic_flags & IEEE80211_F_WEPON)
capinfo |= IEEE80211_CAPINFO_PRIVACY;
if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) &&