From: Malcolm Priestley <tvboxspy@gmail.com>
Date: Wed, 20 Aug 2014 21:30:26 +0000 (+0100)
Subject: staging: vt6655: device.h dead code remove bCCK
X-Git-Tag: firefly_0821_release~176^2~3121^2~967
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5154b0d0e26545c52350f42b1a4c1e6dc0c4360f;p=firefly-linux-kernel-4.4.55.git

staging: vt6655: device.h dead code remove bCCK

bCCK is always set to true, the only place it is used is in
BBvCalculateParameter which nots the value to false.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c
index c1025ff542ed..7dd866e1280c 100644
--- a/drivers/staging/vt6655/baseband.c
+++ b/drivers/staging/vt6655/baseband.c
@@ -1837,7 +1837,6 @@ BBvCalculateParameter(
 	unsigned int cbTmp;
 	bool bExtBit;
 	unsigned char byPreambleType = pDevice->byPreambleType;
-	bool bCCK = pDevice->bCCK;
 
 	cbBitCount = cbFrameLength * 8;
 	bExtBit = false;
@@ -1857,8 +1856,6 @@ BBvCalculateParameter(
 		break;
 
 	case RATE_5M:
-		if (!bCCK)
-			cbBitCount++;
 		cbUsCount = (cbBitCount * 10) / 55;
 		cbTmp = (cbUsCount * 55) / 10;
 		if (cbTmp != cbBitCount)
@@ -1870,9 +1867,6 @@ BBvCalculateParameter(
 		break;
 
 	case RATE_11M:
-
-		if (!bCCK)
-			cbBitCount++;
 		cbUsCount = cbBitCount / 11;
 		cbTmp = cbUsCount * 11;
 		if (cbTmp != cbBitCount) {
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 1abad5dedcfc..2434a3709a82 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -488,7 +488,6 @@ struct vnt_private {
 
 	unsigned long dwMaxReceiveLifetime;       // dot11MaxReceiveLifetime
 
-	bool bCCK;
 	bool bEncryptionEnable;
 	bool bLongHeader;
 	bool bShortSlotTime;
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 3a2fd29cc5b9..1a94d4fded4e 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -469,8 +469,6 @@ static void device_init_registers(struct vnt_private *pDevice)
 	/* Do MACbSoftwareReset in MACvInitialize */
 	MACbSoftwareReset(pDevice->PortOffset);
 
-	/* force CCK */
-	pDevice->bCCK = true;
 	pDevice->bAES = false;
 
 	/* Only used in 11g type, sync with ERP IE */
diff --git a/drivers/staging/vt6655/wmgr.c b/drivers/staging/vt6655/wmgr.c
index c3de107d48db..ba273c75d262 100644
--- a/drivers/staging/vt6655/wmgr.c
+++ b/drivers/staging/vt6655/wmgr.c
@@ -2663,7 +2663,6 @@ s_vMgrSynchBSS(
 	}
 
 	// Init the BSS informations
-	pDevice->bCCK = true;
 	pDevice->bProtectMode = false;
 	MACvDisableProtectMD(pDevice->PortOffset);
 	pDevice->bBarkerPreambleMd = false;