From 84a4f245250adb4c0bed29d40ccc2412aaf365e6 Mon Sep 17 00:00:00 2001
From: Malcolm Priestley <tvboxspy@gmail.com>
Date: Sun, 4 Nov 2012 17:59:05 +0000
Subject: [PATCH] --- yaml --- r: 337768 b: refs/heads/master c:
 bebbb29c96a9fcc78a1644cbbb3db688488dc129 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/staging/vt6656/device.h | 1 -
 trunk/drivers/staging/vt6656/mib.h    | 1 -
 trunk/drivers/staging/vt6656/rxtx.c   | 5 -----
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 898c13c7a0af..831e13c40f19 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95e40c7a169b41796b6998b28b8cadb075359968
+refs/heads/master: bebbb29c96a9fcc78a1644cbbb3db688488dc129
diff --git a/trunk/drivers/staging/vt6656/device.h b/trunk/drivers/staging/vt6656/device.h
index 8d9b9c1a2d50..f334e64ca193 100644
--- a/trunk/drivers/staging/vt6656/device.h
+++ b/trunk/drivers/staging/vt6656/device.h
@@ -733,7 +733,6 @@ typedef struct __device_info {
     BYTE                    byKeyIndex;
 
     BOOL                    bAES;
-    BYTE                    byCntMeasure;
 
     unsigned int                    uKeyLength;
     BYTE                    abyKey[WLAN_WEP232_KEYLEN];
diff --git a/trunk/drivers/staging/vt6656/mib.h b/trunk/drivers/staging/vt6656/mib.h
index 82d69a9cc209..85c28e923663 100644
--- a/trunk/drivers/staging/vt6656/mib.h
+++ b/trunk/drivers/staging/vt6656/mib.h
@@ -68,7 +68,6 @@ typedef struct tagSDot11Counters {
     unsigned long long   TKIPLocalMICFailures;
     unsigned long long   TKIPRemoteMICFailures;
     unsigned long long   TKIPICVErrors;
-    unsigned long long   TKIPCounterMeasuresInvoked;
     unsigned long long   TKIPReplays;
     unsigned long long   CCMPFormatErrors;
     unsigned long long   CCMPReplays;
diff --git a/trunk/drivers/staging/vt6656/rxtx.c b/trunk/drivers/staging/vt6656/rxtx.c
index a54c0c1de2e8..3a4933ecb63b 100644
--- a/trunk/drivers/staging/vt6656/rxtx.c
+++ b/trunk/drivers/staging/vt6656/rxtx.c
@@ -3033,11 +3033,6 @@ int nsDMA_tx_packet(PSDevice pDevice, unsigned int uDMAIdx, struct sk_buff *skb)
                 }
             }
 
-            if (pDevice->byCntMeasure == 2) {
-                bNeedDeAuth = TRUE;
-                pDevice->s802_11Counter.TKIPCounterMeasuresInvoked++;
-            }
-
             if (pDevice->bEnableHostWEP) {
                 if ((uNodeIndex != 0) &&
                     (pMgmt->sNodeDBTable[uNodeIndex].dwKeyIndex & PAIRWISE_KEY)) {