diff --git a/[refs] b/[refs] index 09399579e05a..306eb500b600 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0047e81dc366a0690b4765250c3a1d8caf3797c4 +refs/heads/master: 8d0c123f8b710561cfd34f6e1a5bebc27988edbe diff --git a/trunk/crypto/aes_generic.c b/trunk/crypto/aes_generic.c index e78b7ee44a74..a68c73dae15a 100644 --- a/trunk/crypto/aes_generic.c +++ b/trunk/crypto/aes_generic.c @@ -1,4 +1,4 @@ -/* +/* * Cryptographic API. * * AES Cipher Algorithm. @@ -1127,7 +1127,7 @@ EXPORT_SYMBOL_GPL(crypto_il_tab); #define star_x(x) (((x) & 0x7f7f7f7f) << 1) ^ ((((x) & 0x80808080) >> 7) * 0x1b) -#define imix_col(y,x) do { \ +#define imix_col(y, x) do { \ u = star_x(x); \ v = star_x(u); \ w = star_x(v); \