From 06723b06c6eec95adbfbd0823515375c5c185345 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 10 Mar 2010 12:54:30 +0300 Subject: [PATCH] --- yaml --- r: 196945 b: refs/heads/master c: 64ff4044a8d99ea0ae858d2a0f1128ef82047f9c h: refs/heads/master i: 196943: 48ec1870236322749bcfe01fd8f34ab20d3d49b8 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rt2860/common/cmm_aes.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e2ac7c17f193..d7de8da757e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed57d08b9f500f6553d8fa755d90ec710757d74b +refs/heads/master: 64ff4044a8d99ea0ae858d2a0f1128ef82047f9c diff --git a/trunk/drivers/staging/rt2860/common/cmm_aes.c b/trunk/drivers/staging/rt2860/common/cmm_aes.c index 250357c5cd65..1d159ff82fd2 100644 --- a/trunk/drivers/staging/rt2860/common/cmm_aes.c +++ b/trunk/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 */