summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Bergamini <damien@cvs.openbsd.org>2009-05-11 19:24:58 +0000
committerDamien Bergamini <damien@cvs.openbsd.org>2009-05-11 19:24:58 +0000
commitf611c18cfbffd1b7cba38a63d29a7c024a006c06 (patch)
treeca7295fbdbb9d3a1e31e55a42b8abaadc1c2b69d
parentfb29bde7340da26455ea192c9296e0852ffe20df (diff)
sync setting of the capinfo field of assoc req frames w/ net80211.
fixes association with APs that refuse non short slot time capable STAs.
-rw-r--r--sys/dev/pci/if_iwi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c
index 37901b0f0d0..d54768d8871 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.100 2009/03/29 21:53:52 sthen Exp $ */
+/* $OpenBSD: if_iwi.c,v 1.101 2009/05/11 19:24:57 damien Exp $ */
/*-
* Copyright (c) 2004-2008
@@ -2148,7 +2148,7 @@ iwi_auth_and_assoc(struct iwi_softc *sc)
if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) &&
IEEE80211_IS_CHAN_2GHZ(ni->ni_chan))
capinfo |= IEEE80211_CAPINFO_SHORT_PREAMBLE;
- if (ic->ic_flags & IEEE80211_F_SHSLOT)
+ if (ic->ic_caps & IEEE80211_C_SHSLOT)
capinfo |= IEEE80211_CAPINFO_SHORT_SLOTTIME;
assoc.capinfo = htole16(capinfo);