diff options
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/if_iwi.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwireg.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c index db5eb12bb9b..07b3f305a90 100644 --- a/sys/dev/pci/if_iwi.c +++ b/sys/dev/pci/if_iwi.c @@ -1,4 +1,4 @@ -/* $Id: if_iwi.c,v 1.14 2004/12/04 17:24:06 damien Exp $ */ +/* $Id: if_iwi.c,v 1.15 2004/12/04 19:01:46 damien Exp $ */ /*- * Copyright (c) 2004 @@ -1812,7 +1812,7 @@ iwi_auth_and_assoc(struct iwi_softc *sc) IWI_MODE_11G; assoc.chan = ieee80211_chan2ieee(ic, ni->ni_chan); if (sc->authmode == IEEE80211_AUTH_SHARED) - assoc.auth = IWI_AUTH_SHARED | ic->ic_wep_txkey; + assoc.auth = (ic->ic_wep_txkey << 4) | IWI_AUTH_SHARED; bcopy(ni->ni_tstamp, assoc.tstamp, 8); assoc.capinfo = htole16(ni->ni_capinfo); assoc.lintval = htole16(ic->ic_lintval); diff --git a/sys/dev/pci/if_iwireg.h b/sys/dev/pci/if_iwireg.h index f6161b4e4d2..99d4bfc4a77 100644 --- a/sys/dev/pci/if_iwireg.h +++ b/sys/dev/pci/if_iwireg.h @@ -1,4 +1,4 @@ -/* $Id: if_iwireg.h,v 1.6 2004/12/04 17:24:06 damien Exp $ */ +/* $Id: if_iwireg.h,v 1.7 2004/12/04 19:01:47 damien Exp $ */ /*- * Copyright (c) 2004 @@ -292,9 +292,9 @@ struct iwi_txpower { struct iwi_associate { u_int8_t chan; u_int8_t auth; -#define IWI_AUTH_OPEN (0 << 4) -#define IWI_AUTH_SHARED (1 << 4) -#define IWI_AUTH_NONE (3 << 4) +#define IWI_AUTH_OPEN 0 +#define IWI_AUTH_SHARED 1 +#define IWI_AUTH_NONE 3 u_int8_t type; u_int8_t reserved1; u_int16_t reserved2; |