[PATCH] misc-wireless: Use ARRAY_SIZE macro when appropriate
A patch to use ARRAY_SIZE macro already defined in kernel.h for some miscellaneous wireless drivers with no specific maintaners. Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
22d5743249
commit
e7c04fd3d0
|
@ -1623,7 +1623,7 @@ static void emmh32_setseed(emmh32_context *context, u8 *pkey, int keylen,
|
|||
|
||||
crypto_cipher_setkey(tfm, pkey, 16);
|
||||
counter = 0;
|
||||
for (i = 0; i < (sizeof(context->coeff)/sizeof(context->coeff[0])); ) {
|
||||
for (i = 0; i < ARRAY_SIZE(context->coeff); ) {
|
||||
aes_counter[15] = (u8)(counter >> 0);
|
||||
aes_counter[14] = (u8)(counter >> 8);
|
||||
aes_counter[13] = (u8)(counter >> 16);
|
||||
|
@ -1632,7 +1632,7 @@ static void emmh32_setseed(emmh32_context *context, u8 *pkey, int keylen,
|
|||
memcpy (plain, aes_counter, 16);
|
||||
crypto_cipher_encrypt_one(tfm, plain, plain);
|
||||
cipher = plain;
|
||||
for (j=0; (j<16) && (i< (sizeof(context->coeff)/sizeof(context->coeff[0]))); ) {
|
||||
for (j = 0; (j < 16) && (i < ARRAY_SIZE(context->coeff)); ) {
|
||||
context->coeff[i++] = ntohl(*(u32 *)&cipher[j]);
|
||||
j += 4;
|
||||
}
|
||||
|
|
|
@ -16,6 +16,8 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
|
||||
#include "prismcompat.h"
|
||||
#include "islpci_dev.h"
|
||||
#include "islpci_mgt.h"
|
||||
|
@ -692,7 +694,7 @@ mgt_update_addr(islpci_private *priv)
|
|||
return ret;
|
||||
}
|
||||
|
||||
#define VEC_SIZE(a) (sizeof(a)/sizeof(a[0]))
|
||||
#define VEC_SIZE(a) ARRAY_SIZE(a)
|
||||
|
||||
int
|
||||
mgt_commit(islpci_private *priv)
|
||||
|
|
Loading…
Reference in a new issue