projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into perf/urgent
[cascardo/linux.git]
/
net
/
mac80211
/
key.h
diff --git
a/net/mac80211/key.h
b/net/mac80211/key.h
index
036d57e
..
aaae0ed
100644
(file)
--- a/
net/mac80211/key.h
+++ b/
net/mac80211/key.h
@@
-83,7
+83,7
@@
struct ieee80211_key {
* Management frames.
*/
u8 rx_pn[IEEE80211_NUM_TIDS + 1][IEEE80211_CCMP_PN_LEN];
- struct crypto_
cipher
*tfm;
+ struct crypto_
aead
*tfm;
u32 replays; /* dot11RSNAStatsCCMPReplays */
} ccmp;
struct {