From 6871d3b80d3b7a97e2f3f4f7f8d5871b95258fe7 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 11 Oct 2012 09:54:05 +0300 Subject: [PATCH] --- yaml --- r: 337111 b: refs/heads/master c: ff4573a7afc53ccf6c66622b884d60208d04db2b h: refs/heads/master i: 337109: d988cad37cd30d4f623dda774d6987a8b8673c75 337107: 0849741020a7169d7a831fbf7c60f16d9c0ad6d5 337103: 1d6d4cec9bb42666355714854d5a0d9a34288a2a v: v3 --- [refs] | 2 +- trunk/drivers/staging/vt6655/rxtx.c | 2 +- trunk/drivers/staging/vt6656/rxtx.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ff6198eb5c98..97c0d88e3925 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f20fbdf829c11c3c29ee94c0c10ec6195ac4c362 +refs/heads/master: ff4573a7afc53ccf6c66622b884d60208d04db2b diff --git a/trunk/drivers/staging/vt6655/rxtx.c b/trunk/drivers/staging/vt6655/rxtx.c index 4972e57845c2..875ee4442386 100644 --- a/trunk/drivers/staging/vt6655/rxtx.c +++ b/trunk/drivers/staging/vt6655/rxtx.c @@ -242,7 +242,7 @@ s_vFillTxKey ( } // Append IV after Mac Header *pdwIV &= WEP_IV_MASK;//00000000 11111111 11111111 11111111 - *pdwIV |= (byKeyIndex << 30); + *pdwIV |= (unsigned long)byKeyIndex << 30; *pdwIV = cpu_to_le32(*pdwIV); pDevice->dwIVCounter++; if (pDevice->dwIVCounter > WEP_IV_MASK) { diff --git a/trunk/drivers/staging/vt6656/rxtx.c b/trunk/drivers/staging/vt6656/rxtx.c index 339083879883..a54c0c1de2e8 100644 --- a/trunk/drivers/staging/vt6656/rxtx.c +++ b/trunk/drivers/staging/vt6656/rxtx.c @@ -355,7 +355,7 @@ s_vFillTxKey ( } // Append IV after Mac Header *pdwIV &= WEP_IV_MASK;//00000000 11111111 11111111 11111111 - *pdwIV |= (pDevice->byKeyIndex << 30); + *pdwIV |= (unsigned long)pDevice->byKeyIndex << 30; *pdwIV = cpu_to_le32(*pdwIV); pDevice->dwIVCounter++; if (pDevice->dwIVCounter > WEP_IV_MASK) {