diff options
author | Jouni Malinen <j@w1.fi> | 2009-01-08 06:32:02 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-01-29 16:00:03 -0500 |
commit | 3cfcf6ac6d69dc290e96416731eea5c88ac7d426 (patch) | |
tree | 35bc626e2e3f7c37a7eb50c1f057adb4830eccc6 /net/mac80211/ieee80211_i.h | |
parent | 765cb46a3fc856245ea68a7c961ac87c77e4ae2d (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 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 20af92abd61d..8c3245717c55 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -409,8 +409,10 @@ struct ieee80211_sub_if_data { | |||
409 | unsigned int fragment_next; | 409 | unsigned int fragment_next; |
410 | 410 | ||
411 | #define NUM_DEFAULT_KEYS 4 | 411 | #define NUM_DEFAULT_KEYS 4 |
412 | struct ieee80211_key *keys[NUM_DEFAULT_KEYS]; | 412 | #define NUM_DEFAULT_MGMT_KEYS 2 |
413 | struct ieee80211_key *keys[NUM_DEFAULT_KEYS + NUM_DEFAULT_MGMT_KEYS]; | ||
413 | struct ieee80211_key *default_key; | 414 | struct ieee80211_key *default_key; |
415 | struct ieee80211_key *default_mgmt_key; | ||
414 | 416 | ||
415 | u16 sequence_number; | 417 | u16 sequence_number; |
416 | 418 | ||
@@ -482,6 +484,7 @@ struct ieee80211_sub_if_data { | |||
482 | } debugfs; | 484 | } debugfs; |
483 | struct { | 485 | struct { |
484 | struct dentry *default_key; | 486 | struct dentry *default_key; |
487 | struct dentry *default_mgmt_key; | ||
485 | } common_debugfs; | 488 | } common_debugfs; |
486 | 489 | ||
487 | #ifdef CONFIG_MAC80211_MESH | 490 | #ifdef CONFIG_MAC80211_MESH |