diff options
| author | Dan Carpenter <error27@gmail.com> | 2010-03-10 12:54:30 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 11:35:35 -0700 |
| commit | 64ff4044a8d99ea0ae858d2a0f1128ef82047f9c (patch) | |
| tree | 487afb64b15af624ebe29f904e72725736188353 | |
| parent | ed57d08b9f500f6553d8fa755d90ec710757d74b (diff) | |
Staging: rt2860: clean up & => &&
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@gmail.com>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | 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 250357c5cd65..1d159ff82fd2 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 */ |