diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-08-05 19:12:53 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-05 19:12:53 +0200 |
| commit | e7f1c4b12cbb143e9b6d1cdd0f1ec9a7725b4cac (patch) | |
| tree | f85423e39a43c2fd768e8d3a63d527abe5548ad9 /include | |
| parent | b7d119a04244fd17aa69e4f4f4e8a33cc60d1090 (diff) | |
| parent | 7494e29338fedcfeb5ed1e31eefe5742b786a2be (diff) | |
| download | kernel-crypto-e7f1c4b12cbb143e9b6d1cdd0f1ec9a7725b4cac.tar.gz kernel-crypto-e7f1c4b12cbb143e9b6d1cdd0f1ec9a7725b4cac.tar.xz kernel-crypto-e7f1c4b12cbb143e9b6d1cdd0f1ec9a7725b4cac.zip | |
Merge branch 'standalone-rename' into userspace-crypto
Conflicts:
crypto/userspace/ncr-dh.c
crypto/userspace/ncr-key-storage.c
crypto/userspace/ncr-key-wrap.c
crypto/userspace/ncr-key.c
crypto/userspace/ncr-limits.c
crypto/userspace/ncr-pk.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ncr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ncr.h b/include/linux/ncr.h index 9b96a038ff5..06f34e2812a 100644 --- a/include/linux/ncr.h +++ b/include/linux/ncr.h @@ -56,7 +56,7 @@ typedef enum { typedef int ncr_key_t; -#define NCR_KEY_INVALID (ncr_key_t)(0) +#define NCR_KEY_INVALID ((ncr_key_t)-1) #define NCR_KEY_FLAG_EXPORTABLE 1 #define NCR_KEY_FLAG_WRAPPABLE (1<<1) @@ -246,7 +246,7 @@ typedef enum { } ncr_crypto_op_t; typedef int ncr_session_t; -#define NCR_SESSION_INVALID (ncr_session_t)0 +#define NCR_SESSION_INVALID ((ncr_session_t)-1) /* input of CIOCGSESSION */ struct ncr_session_st { |