diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2007-07-18 18:10:32 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2007-07-18 18:10:32 +0000 |
| commit | b0b399694977801dc175a7554f8045923e44f7eb (patch) | |
| tree | 7d1f39fd88f1022730d45f888f660cd787566366 /sys/dev/usb/if_atu.c | |
| parent | f7f63cd087c89a071fd5bbd90a28ce1cf0d1275f (diff) | |
replace the ieee80211_wepkey structure with a more generic ieee80211_key
one that can be used with other ciphers than WEP.
Diffstat (limited to 'sys/dev/usb/if_atu.c')
| -rw-r--r-- | sys/dev/usb/if_atu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c index c2569ee4606..9cc51335637 100644 --- a/sys/dev/usb/if_atu.c +++ b/sys/dev/usb/if_atu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_atu.c,v 1.85 2007/06/14 10:11:15 mbalmer Exp $ */ +/* $OpenBSD: if_atu.c,v 1.86 2007/07/18 18:10:31 damien Exp $ */ /* * Copyright (c) 2003, 2004 * Daan Vreeken <Danovitsch@Vitsch.net>. All rights reserved. @@ -689,11 +689,11 @@ atu_initial_config(struct atu_softc *sc) cmd.PrivacyInvoked = (ic->ic_flags & IEEE80211_F_WEPON) ? 1 : 0; cmd.ExcludeUnencrypted = 0; - switch (ic->ic_nw_keys[ic->ic_wep_txkey].wk_len) { - case 5: + switch (ic->ic_nw_keys[ic->ic_wep_txkey].k_cipher) { + case IEEE80211_CIPHER_WEP40: cmd.EncryptionType = ATU_WEP_40BITS; break; - case 13: + case IEEE80211_CIPHER_WEP104: cmd.EncryptionType = ATU_WEP_104BITS; break; default: @@ -703,8 +703,8 @@ atu_initial_config(struct atu_softc *sc) cmd.WEP_DefaultKeyID = ic->ic_wep_txkey; for (i = 0; i < IEEE80211_WEP_NKID; i++) { - memcpy(cmd.WEP_DefaultKey[i], ic->ic_nw_keys[i].wk_key, - ic->ic_nw_keys[i].wk_len); + memcpy(cmd.WEP_DefaultKey[i], ic->ic_nw_keys[i].k_key, + ic->ic_nw_keys[i].k_len); } /* Setting the SSID here doesn't seem to do anything */ |