diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-01-15 12:46:14 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-01-15 12:46:14 -0500 |
| commit | 0c49cd295d42d0032af11d55e2140dbec11dc8d0 (patch) | |
| tree | 1e7d0e50b6b6d6e4de1fb6bb0b6d856c3932da58 /include/uapi/linux/if_alg.h | |
| parent | 0c3e99437a66e4c869c60c2398449e6d98f3a988 (diff) | |
| parent | eaa27f34e91a14cdceed26ed6c6793ec1d186115 (diff) | |
Merge tag 'v3.19-rc4' into next
Merge with mainline to bring in the latest thermal and other changes.
Diffstat (limited to 'include/uapi/linux/if_alg.h')
| -rw-r--r-- | include/uapi/linux/if_alg.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/if_alg.h b/include/uapi/linux/if_alg.h index 0f9acce5b1ff..f2acd2fde1f3 100644 --- a/include/uapi/linux/if_alg.h +++ b/include/uapi/linux/if_alg.h | |||
| @@ -32,6 +32,8 @@ struct af_alg_iv { | |||
| 32 | #define ALG_SET_KEY 1 | 32 | #define ALG_SET_KEY 1 |
| 33 | #define ALG_SET_IV 2 | 33 | #define ALG_SET_IV 2 |
| 34 | #define ALG_SET_OP 3 | 34 | #define ALG_SET_OP 3 |
| 35 | #define ALG_SET_AEAD_ASSOCLEN 4 | ||
| 36 | #define ALG_SET_AEAD_AUTHSIZE 5 | ||
| 35 | 37 | ||
| 36 | /* Operations */ | 38 | /* Operations */ |
| 37 | #define ALG_OP_DECRYPT 0 | 39 | #define ALG_OP_DECRYPT 0 |