瀏覽代碼

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>
Malcolm Priestley 11 年之前
父節點
當前提交
5154b0d0e2

+ 0 - 6
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) {

+ 0 - 1
drivers/staging/vt6655/device.h

@@ -488,7 +488,6 @@ struct vnt_private {
 
 	unsigned long dwMaxReceiveLifetime;       // dot11MaxReceiveLifetime
 
-	bool bCCK;
 	bool bEncryptionEnable;
 	bool bLongHeader;
 	bool bShortSlotTime;

+ 0 - 2
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 */

+ 0 - 1
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;