aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/mac80211.h
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2009-01-08 06:32:02 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 16:00:03 -0500
commit3cfcf6ac6d69dc290e96416731eea5c88ac7d426 (patch)
tree35bc626e2e3f7c37a7eb50c1f057adb4830eccc6 /include/net/mac80211.h
parent765cb46a3fc856245ea68a7c961ac87c77e4ae2d (diff)
mac80211: 802.11w - Use BIP (AES-128-CMAC)
Add mechanism for managing BIP keys (IGTK) and integrate BIP into the TX/RX paths. Signed-off-by: Jouni Malinen <j@w1.fi> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r--include/net/mac80211.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 8a305bfdb87b..61f1f37a9e27 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -651,11 +651,13 @@ struct ieee80211_if_conf {
651 * @ALG_WEP: WEP40 or WEP104 651 * @ALG_WEP: WEP40 or WEP104
652 * @ALG_TKIP: TKIP 652 * @ALG_TKIP: TKIP
653 * @ALG_CCMP: CCMP (AES) 653 * @ALG_CCMP: CCMP (AES)
654 * @ALG_AES_CMAC: AES-128-CMAC
654 */ 655 */
655enum ieee80211_key_alg { 656enum ieee80211_key_alg {
656 ALG_WEP, 657 ALG_WEP,
657 ALG_TKIP, 658 ALG_TKIP,
658 ALG_CCMP, 659 ALG_CCMP,
660 ALG_AES_CMAC,
659}; 661};
660 662
661/** 663/**