diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-10-29 14:52:04 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-10-29 14:52:04 -0400 |
| commit | d1f10302568221c20628200bc8baa426c55f61c0 (patch) | |
| tree | 5eeb95d847924ec587e5e9a47ea2d2275d37635f /include | |
| parent | 9b34f40c20111ba658f88e1669598db494be1fbc (diff) | |
| parent | 1724ffbc7439de679d536163e03f54f35574d449 (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/mac80211.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 71c2f9c2f5be..00b7204708bd 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
| @@ -3223,6 +3223,19 @@ void ieee80211_get_tkip_p2k(struct ieee80211_key_conf *keyconf, | |||
| 3223 | struct sk_buff *skb, u8 *p2k); | 3223 | struct sk_buff *skb, u8 *p2k); |
| 3224 | 3224 | ||
| 3225 | /** | 3225 | /** |
| 3226 | * ieee80211_aes_cmac_calculate_k1_k2 - calculate the AES-CMAC sub keys | ||
| 3227 | * | ||
| 3228 | * This function computes the two AES-CMAC sub-keys, based on the | ||
| 3229 | * previously installed master key. | ||
| 3230 | * | ||
| 3231 | * @keyconf: the parameter passed with the set key | ||
| 3232 | * @k1: a buffer to be filled with the 1st sub-key | ||
| 3233 | * @k2: a buffer to be filled with the 2nd sub-key | ||
| 3234 | */ | ||
| 3235 | void ieee80211_aes_cmac_calculate_k1_k2(struct ieee80211_key_conf *keyconf, | ||
| 3236 | u8 *k1, u8 *k2); | ||
| 3237 | |||
| 3238 | /** | ||
| 3226 | * struct ieee80211_key_seq - key sequence counter | 3239 | * struct ieee80211_key_seq - key sequence counter |
| 3227 | * | 3240 | * |
| 3228 | * @tkip: TKIP data, containing IV32 and IV16 in host byte order | 3241 | * @tkip: TKIP data, containing IV32 and IV16 in host byte order |