Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
include
/
linux
/
key-type.h
diff --git
a/kernel/include/linux/key-type.h
b/kernel/include/linux/key-type.h
index
ff9f1d3
..
7463355
100644
(file)
--- a/
kernel/include/linux/key-type.h
+++ b/
kernel/include/linux/key-type.h
@@
-40,8
+40,7
@@
struct key_construction {
*/
struct key_preparsed_payload {
char *description; /* Proposed key description (or NULL) */
*/
struct key_preparsed_payload {
char *description; /* Proposed key description (or NULL) */
- void *type_data[2]; /* Private key-type data */
- void *payload[2]; /* Proposed payload */
+ union key_payload payload; /* Proposed payload */
const void *data; /* Raw data */
size_t datalen; /* Raw datalen */
size_t quotalen; /* Quota length for proposed payload */
const void *data; /* Raw data */
size_t datalen; /* Raw datalen */
size_t quotalen; /* Quota length for proposed payload */