aboutsummaryrefslogtreecommitdiffstats
path: root/module/icp/algs
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2019-07-16 17:22:31 -0700
committerGitHub <[email protected]>2019-07-16 17:22:31 -0700
commit8062b7686aa2c3a22824b9a7c83cf01a5fa457a0 (patch)
treee7e316a0cdadec44f3d6bde7adaf917dccdd6370 /module/icp/algs
parent3b03ff22761da0f5fad9a781025facfc6e555522 (diff)
Minor style cleanup
Resolve an assortment of style inconsistencies including use of white space, typos, capitalization, and line wrapping. There is no functional change. Reviewed-by: Tony Hutter <[email protected]> Reviewed-by: George Melikov <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #9030
Diffstat (limited to 'module/icp/algs')
-rw-r--r--module/icp/algs/aes/aes_impl.c11
-rw-r--r--module/icp/algs/modes/gcm.c10
2 files changed, 14 insertions, 7 deletions
diff --git a/module/icp/algs/aes/aes_impl.c b/module/icp/algs/aes/aes_impl.c
index 457b9e45c..0f11f9999 100644
--- a/module/icp/algs/aes/aes_impl.c
+++ b/module/icp/algs/aes/aes_impl.c
@@ -311,16 +311,21 @@ aes_impl_init(void *arg)
}
aes_supp_impl_cnt = c;
- /* set fastest implementation. assume hardware accelerated is fastest */
+ /*
+ * Set the fastest implementation given the assumption that the
+ * hardware accelerated version is the fastest.
+ */
#if defined(__x86_64)
#if defined(HAVE_AES)
- if (aes_aesni_impl.is_supported())
+ if (aes_aesni_impl.is_supported()) {
memcpy(&aes_fastest_impl, &aes_aesni_impl,
sizeof (aes_fastest_impl));
- else
+ } else
#endif
+ {
memcpy(&aes_fastest_impl, &aes_x86_64_impl,
sizeof (aes_fastest_impl));
+ }
#else
memcpy(&aes_fastest_impl, &aes_generic_impl,
sizeof (aes_fastest_impl));
diff --git a/module/icp/algs/modes/gcm.c b/module/icp/algs/modes/gcm.c
index f6f8434de..423b70e2c 100644
--- a/module/icp/algs/modes/gcm.c
+++ b/module/icp/algs/modes/gcm.c
@@ -647,7 +647,7 @@ const gcm_impl_ops_t *gcm_all_impl[] = {
/* Indicate that benchmark has been completed */
static boolean_t gcm_impl_initialized = B_FALSE;
-/* Select aes implementation */
+/* Select GCM implementation */
#define IMPL_FASTEST (UINT32_MAX)
#define IMPL_CYCLE (UINT32_MAX-1)
@@ -724,13 +724,15 @@ gcm_impl_init(void *arg)
* hardware accelerated version is the fastest.
*/
#if defined(__x86_64) && defined(HAVE_PCLMULQDQ)
- if (gcm_pclmulqdq_impl.is_supported())
+ if (gcm_pclmulqdq_impl.is_supported()) {
memcpy(&gcm_fastest_impl, &gcm_pclmulqdq_impl,
sizeof (gcm_fastest_impl));
- else
+ } else
#endif
+ {
memcpy(&gcm_fastest_impl, &gcm_generic_impl,
sizeof (gcm_fastest_impl));
+ }
strcpy(gcm_fastest_impl.name, "fastest");
@@ -753,7 +755,7 @@ static const struct {
* If we are called before init(), user preference will be saved in
* user_sel_impl, and applied in later init() call. This occurs when module
* parameter is specified on module load. Otherwise, directly update
- * icp_aes_impl.
+ * icp_gcm_impl.
*
* @val Name of gcm implementation to use
* @param Unused.