[PATCH 057/577] Staging: rt2860: clean up & => &&
Greg Kroah-Hartman
gregkh at suse.de
Fri May 21 19:56:26 UTC 2010
From: Dan Carpenter <error27 at gmail.com>
a4_exists is an integer used as a boolean type so the original code
works. But all the other conditions use && and this makes it
consistent.
Signed-off-by: Dan Carpenter <error27 at gmail.com>
Cc: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
drivers/staging/rt2860/common/cmm_aes.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/rt2860/common/cmm_aes.c b/drivers/staging/rt2860/common/cmm_aes.c
index 250357c..1d159ff 100644
--- a/drivers/staging/rt2860/common/cmm_aes.c
+++ b/drivers/staging/rt2860/common/cmm_aes.c
@@ -281,7 +281,7 @@ void construct_mic_header2(unsigned char *mic_header2,
mic_header2[6] = mpdu[22] & 0x0f; /* SC */
mic_header2[7] = 0x00; /* mpdu[23]; */
- if ((!qc_exists) & a4_exists) {
+ if ((!qc_exists) && a4_exists) {
for (i = 0; i < 6; i++)
mic_header2[8 + i] = mpdu[24 + i]; /* A4 */
--
1.7.0.3
More information about the devel
mailing list