net/mlx4_en: Fix mixed PFC and Global pause user control requests

[pandora-kernel.git] / crypto / anubis.c

diff --git a/crypto/anubis.c b/crypto/anubis.c
index e42c3a8..523ed52 100644 (file)
--- a/crypto/anubis.c
+++ b/crypto/anubis.c
@@ -469,14 +469,13 @@ static int anubis_setkey(struct crypto_tfm *tfm, const u8 *in_key,
        u32 kappa[ANUBIS_MAX_N];
        u32 inter[ANUBIS_MAX_N];
 
-       switch (key_len)
-       {
+       switch (key_len) {
                case 16: case 20: case 24: case 28:
                case 32: case 36: case 40:
                        break;
                default:
                        *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
-                       return - EINVAL;
+                       return -EINVAL;
        }
 
        ctx->key_len = key_len * 8;
@@ -530,23 +529,24 @@ static int anubis_setkey(struct crypto_tfm *tfm, const u8 *in_key,
                /*
                 * compute kappa^{r+1} from kappa^r:
                 */
-               if (r == R) {
+               if (r == R)
                        break;
-               }
                for (i = 0; i < N; i++) {
                        int j = i;
                        inter[i]  = T0[(kappa[j--] >> 24)       ];
-                       if (j < 0) j = N - 1;
+                       if (j < 0)
+                               j = N - 1;
                        inter[i] ^= T1[(kappa[j--] >> 16) & 0xff];
-                       if (j < 0) j = N - 1;
+                       if (j < 0)
+                               j = N - 1;
                        inter[i] ^= T2[(kappa[j--] >>  8) & 0xff];
-                       if (j < 0) j = N - 1;
+                       if (j < 0)
+                               j = N - 1;
                        inter[i] ^= T3[(kappa[j  ]      ) & 0xff];
                }
                kappa[0] = inter[0] ^ rc[r];
-               for (i = 1; i < N; i++) {
+               for (i = 1; i < N; i++)
                        kappa[i] = inter[i];
-               }
        }
 
        /*
@@ -690,7 +690,7 @@ static struct crypto_alg anubis_alg = {
 static int __init anubis_mod_init(void)
 {
        int ret = 0;
-       
+
        ret = crypto_register_alg(&anubis_alg);
        return ret;
 }
@@ -705,3 +705,4 @@ module_exit(anubis_mod_fini);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Anubis Cryptographic Algorithm");
+MODULE_ALIAS_CRYPTO("anubis");