diff options
| author | sam <sam@FreeBSD.org> | 2007-03-11 06:36:10 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2007-03-11 06:36:10 +0000 |
| commit | b04c5bd38256cacaf01d5e5de001265ee280c21f (patch) | |
| tree | c8836cf18bb680aa720bd7556c512bad8fb3cca7 /sys/net80211/ieee80211_crypto.c | |
| parent | 679daf849749d409c8c49c8cc5e58093b228968f (diff) | |
| download | FreeBSD-src-b04c5bd38256cacaf01d5e5de001265ee280c21f.zip FreeBSD-src-b04c5bd38256cacaf01d5e5de001265ee280c21f.tar.gz | |
add IEEE80211_KEY_UNDEFINED and use it instead of local defs
Obtained from: netbsd
Diffstat (limited to 'sys/net80211/ieee80211_crypto.c')
| -rw-r--r-- | sys/net80211/ieee80211_crypto.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c index e9ce135..4f60133 100644 --- a/sys/net80211/ieee80211_crypto.c +++ b/sys/net80211/ieee80211_crypto.c @@ -521,7 +521,7 @@ ieee80211_crypto_encap(struct ieee80211com *ic, */ wh = mtod(m, struct ieee80211_frame *); if (IEEE80211_IS_MULTICAST(wh->i_addr1) || - ni->ni_ucastkey.wk_cipher == &ieee80211_cipher_none) { + IEEE80211_KEY_UNDEFINED(&ni->ni_ucastkey)) { if (ic->ic_def_txkey == IEEE80211_KEYIX_NONE) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_CRYPTO, "[%s] no default transmit key (%s) deftxkey %u\n", @@ -577,7 +577,7 @@ ieee80211_crypto_decap(struct ieee80211com *ic, ivp = mtod(m, const u_int8_t *) + hdrlen; /* XXX contig */ keyid = ivp[IEEE80211_WEP_IVLEN]; if (IEEE80211_IS_MULTICAST(wh->i_addr1) || - ni->ni_ucastkey.wk_cipher == &ieee80211_cipher_none) + IEEE80211_KEY_UNDEFINED(&ni->ni_ucastkey)) k = &ic->ic_nw_keys[keyid >> 6]; else k = &ni->ni_ucastkey; |
