diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2008-09-03 19:47:59 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2008-09-03 19:47:59 +0000 |
| commit | 984b5384dcc90aa164fa19cd817fa117c0ebb2f4 (patch) | |
| tree | 0277e6391f9816c56c689d42447072191c2332d6 /sys/dev | |
| parent | ac4a961f0dd9866075fa4edf8e74deeca14999a8 (diff) | |
(Re)Association requests should contain a QoS Capability element,
not an EDCA Parameter Set element (spotted by IEEE80211_STA_ONLY).
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_iwi.c | 8 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwireg.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c index 0ea7b52ed17..0cfdc95f3c1 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.92 2008/09/03 19:43:59 damien Exp $ */ +/* $OpenBSD: if_iwi.c,v 1.93 2008/09/03 19:47:58 damien Exp $ */ /*- * Copyright (c) 2004-2008 @@ -2125,9 +2125,9 @@ iwi_auth_and_assoc(struct iwi_softc *sc) if (ic->ic_flags & IEEE80211_F_QOS) { iwi_update_edca(ic); - frm = ieee80211_add_edca_params(buf, ic); - DPRINTF(("Setting EDCA IE length %d\n", frm - buf)); - error = iwi_cmd(sc, IWI_CMD_SET_EDCAIE, buf, frm - buf, 1); + frm = ieee80211_add_qos_capability(buf, ic); + DPRINTF(("Setting QoS Capability IE length %d\n", frm - buf)); + error = iwi_cmd(sc, IWI_CMD_SET_QOS_CAP, buf, frm - buf, 1); if (error != 0) return error; } diff --git a/sys/dev/pci/if_iwireg.h b/sys/dev/pci/if_iwireg.h index 1ed784fb745..afc526c0bc7 100644 --- a/sys/dev/pci/if_iwireg.h +++ b/sys/dev/pci/if_iwireg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwireg.h,v 1.26 2008/08/28 15:52:20 damien Exp $ */ +/* $OpenBSD: if_iwireg.h,v 1.27 2008/09/03 19:47:58 damien Exp $ */ /*- * Copyright (c) 2004-2008 @@ -264,7 +264,7 @@ struct iwi_cmd_desc { #define IWI_CMD_SET_RANDOM_SEED 34 #define IWI_CMD_SET_TX_POWER 35 #define IWI_CMD_SET_SENSITIVITY 42 -#define IWI_CMD_SET_EDCAIE 84 +#define IWI_CMD_SET_QOS_CAP 84 uint8_t len; uint16_t reserved; |