From 5154b0d0e26545c52350f42b1a4c1e6dc0c4360f Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Wed, 20 Aug 2014 22:30:26 +0100 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/baseband.c | 6 ------ drivers/staging/vt6655/device.h | 1 - drivers/staging/vt6655/device_main.c | 2 -- drivers/staging/vt6655/wmgr.c | 1 - 4 files changed, 10 deletions(-) diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c index c1025ff..7dd866e 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 1abad5d..2434a37 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 3a2fd29..1a94d4f 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 c3de107..ba273c7 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; -- 2.7.4