diff options
| author | sam <sam@FreeBSD.org> | 2008-05-28 23:32:00 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2008-05-28 23:32:00 +0000 |
| commit | 7aa0974e2beebe0274ddf6e9c4c6663f0153b9fb (patch) | |
| tree | 11f1e7429f40b4646c19d38f606412f9c2290a86 /sys/net80211/ieee80211_crypto.h | |
| parent | 6be5c5b31dc02a4f03bf8981291eaf6adfce5882 (diff) | |
| download | FreeBSD-src-7aa0974e2beebe0274ddf6e9c4c6663f0153b9fb.zip FreeBSD-src-7aa0974e2beebe0274ddf6e9c4c6663f0153b9fb.tar.gz | |
Add a mac address to the key definition as otherwise we lose the
address specified in the ioctl and for drivers that need the address
to locate a key (e.g. for delete).
Note this changes net80211-private api's but not the driver callback;
may want to change that in the future.
Reviewed by: sephe, thompsa
Diffstat (limited to 'sys/net80211/ieee80211_crypto.h')
| -rw-r--r-- | sys/net80211/ieee80211_crypto.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/net80211/ieee80211_crypto.h b/sys/net80211/ieee80211_crypto.h index c0ae068..f6f666c 100644 --- a/sys/net80211/ieee80211_crypto.h +++ b/sys/net80211/ieee80211_crypto.h @@ -92,6 +92,7 @@ struct ieee80211_key { uint64_t wk_keytsc; /* key transmit sequence counter */ const struct ieee80211_cipher *wk_cipher; void *wk_private; /* private cipher state */ + uint8_t wk_macaddr[IEEE80211_ADDR_LEN]; }; #define IEEE80211_KEY_COMMON /* common flags passed in by apps */\ (IEEE80211_KEY_XMIT | IEEE80211_KEY_RECV | IEEE80211_KEY_GROUP) @@ -144,9 +145,7 @@ int ieee80211_crypto_newkey(struct ieee80211vap *, int cipher, int flags, struct ieee80211_key *); int ieee80211_crypto_delkey(struct ieee80211vap *, struct ieee80211_key *); -int ieee80211_crypto_setkey(struct ieee80211vap *, - struct ieee80211_key *, - const uint8_t macaddr[IEEE80211_ADDR_LEN]); +int ieee80211_crypto_setkey(struct ieee80211vap *, struct ieee80211_key *); void ieee80211_crypto_delglobalkeys(struct ieee80211vap *); /* |
