diff options
author | John W. Linville <linville@tuxdriver.com> | 2007-02-18 02:26:09 +0300 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2007-02-18 02:26:09 +0300 |
commit | b312362be6d9155b66f3a26d9159e0a680fbd6c5 (patch) | |
tree | 52ebaad6117abf806dab4e738d01b509839f7b12 /drivers/net/wireless/airo.c | |
parent | bdcac1878c80b068d8e073c1691d4bd09ba9996d (diff) | |
parent | bb52a653eaef4aee877b2fa36de8699926f788bd (diff) | |
download | linux-b312362be6d9155b66f3a26d9159e0a680fbd6c5.tar.xz |
Merge branch 'upstream' into upstream-jgarzik
Conflicts:
net/ieee80211/softmac/ieee80211softmac_module.c
net/ieee80211/softmac/ieee80211softmac_wx.c
Diffstat (limited to 'drivers/net/wireless/airo.c')
-rw-r--r-- | drivers/net/wireless/airo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index b08055abe83a..a8c2bfe26c27 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c @@ -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; } |