From 137ac3fd49cbd846e711434c76047837b5a0d97d Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 11 Oct 2012 09:55:25 +0300 Subject: [PATCH] --- yaml --- r: 337112 b: refs/heads/master c: c25015c1184e7e54c02e0dfd5044eec38dec482c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/vt6655/hostap.c | 6 +++--- trunk/drivers/staging/vt6656/hostap.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 97c0d88e3925..362f0bc0aa35 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff4573a7afc53ccf6c66622b884d60208d04db2b +refs/heads/master: c25015c1184e7e54c02e0dfd5044eec38dec482c diff --git a/trunk/drivers/staging/vt6655/hostap.c b/trunk/drivers/staging/vt6655/hostap.c index 67b1b88b1b89..5f13890cf124 100644 --- a/trunk/drivers/staging/vt6655/hostap.c +++ b/trunk/drivers/staging/vt6655/hostap.c @@ -596,9 +596,9 @@ static int hostap_set_encryption(PSDevice pDevice, if (param->u.crypt.seq) { memcpy(&abySeq, param->u.crypt.seq, 8); - for (ii = 0 ; ii < 8 ; ii++) { - KeyRSC |= (abySeq[ii] << (ii * 8)); - } + for (ii = 0 ; ii < 8 ; ii++) + KeyRSC |= (unsigned long)abySeq[ii] << (ii * 8); + dwKeyIndex |= 1 << 29; pMgmt->sNodeDBTable[iNodeIndex].KeyRSC = KeyRSC; } diff --git a/trunk/drivers/staging/vt6656/hostap.c b/trunk/drivers/staging/vt6656/hostap.c index 0a73d4060ee1..26a7d0e4b048 100644 --- a/trunk/drivers/staging/vt6656/hostap.c +++ b/trunk/drivers/staging/vt6656/hostap.c @@ -542,9 +542,9 @@ static int hostap_set_encryption(PSDevice pDevice, if (param->u.crypt.seq) { memcpy(&abySeq, param->u.crypt.seq, 8); - for (ii = 0 ; ii < 8 ; ii++) { - KeyRSC |= (abySeq[ii] << (ii * 8)); - } + for (ii = 0 ; ii < 8 ; ii++) + KeyRSC |= (unsigned long)abySeq[ii] << (ii * 8); + dwKeyIndex |= 1 << 29; pMgmt->sNodeDBTable[iNodeIndex].KeyRSC = KeyRSC; }