From 38f2b7ef16728e4a940869a95d0e023a8bc0f548 Mon Sep 17 00:00:00 2001
From: Malcolm Priestley <tvboxspy@gmail.com>
Date: Sun, 11 Nov 2012 16:07:57 +0000
Subject: [PATCH] --- yaml --- r: 337784 b: refs/heads/master c:
 70e227790d4ee4590023d8041a3485f8053593fc h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/staging/vt6656/wcmd.c | 20 +++++++++++---------
 trunk/drivers/staging/vt6656/wpa2.h |  4 ++--
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index f818b082568d..e60e68f52c92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d651be13f59ddf706283eb61f2590aedd44cd2d
+refs/heads/master: 70e227790d4ee4590023d8041a3485f8053593fc
diff --git a/trunk/drivers/staging/vt6656/wcmd.c b/trunk/drivers/staging/vt6656/wcmd.c
index 586fbe1627f7..b854d7ef97d7 100644
--- a/trunk/drivers/staging/vt6656/wcmd.c
+++ b/trunk/drivers/staging/vt6656/wcmd.c
@@ -316,17 +316,19 @@ s_MgrMakeProbeRequest(
     return pTxPacket;
 }
 
-void vCommandTimerWait(void *hDeviceContext, unsigned int MSecond)
+void vCommandTimerWait(void *hDeviceContext, unsigned long MSecond)
 {
-    PSDevice        pDevice = (PSDevice)hDeviceContext;
+	PSDevice pDevice = (PSDevice)hDeviceContext;
 
-    init_timer(&pDevice->sTimerCommand);
-    pDevice->sTimerCommand.data = (unsigned long)pDevice;
-    pDevice->sTimerCommand.function = (TimerFunction)vRunCommand;
-    // RUN_AT :1 msec ~= (HZ/1024)
-    pDevice->sTimerCommand.expires = (unsigned int)RUN_AT((MSecond * HZ) >> 10);
-    add_timer(&pDevice->sTimerCommand);
-    return;
+	init_timer(&pDevice->sTimerCommand);
+
+	pDevice->sTimerCommand.data = (unsigned long)pDevice;
+	pDevice->sTimerCommand.function = (TimerFunction)vRunCommand;
+	pDevice->sTimerCommand.expires = RUN_AT((MSecond * HZ) / 1000);
+
+	add_timer(&pDevice->sTimerCommand);
+
+	return;
 }
 
 void vRunCommand(void *hDeviceContext)
diff --git a/trunk/drivers/staging/vt6656/wpa2.h b/trunk/drivers/staging/vt6656/wpa2.h
index 46c295905b48..c359252a6b0e 100644
--- a/trunk/drivers/staging/vt6656/wpa2.h
+++ b/trunk/drivers/staging/vt6656/wpa2.h
@@ -45,8 +45,8 @@ typedef struct tagsPMKIDInfo {
 } PMKIDInfo, *PPMKIDInfo;
 
 typedef struct tagSPMKIDCache {
-    unsigned long       BSSIDInfoCount;
-    PMKIDInfo   BSSIDInfo[MAX_PMKID_CACHE];
+	u32 BSSIDInfoCount;
+	PMKIDInfo BSSIDInfo[MAX_PMKID_CACHE];
 } SPMKIDCache, *PSPMKIDCache;