diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-08-20 22:30:26 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-30 13:48:19 -0700 |
| commit | 5154b0d0e26545c52350f42b1a4c1e6dc0c4360f (patch) | |
| tree | 9018c85b40c5198e3c97dc8d43c3950aeacb128f | |
| parent | 9e9df6704c1929ffd76e73f4740a468e00c44c11 (diff) | |
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>
| -rw-r--r-- | drivers/staging/vt6655/baseband.c | 6 | ||||
| -rw-r--r-- | drivers/staging/vt6655/device.h | 1 | ||||
| -rw-r--r-- | drivers/staging/vt6655/device_main.c | 2 | ||||
| -rw-r--r-- | drivers/staging/vt6655/wmgr.c | 1 |
4 files changed, 0 insertions, 10 deletions
diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c index c1025ff542e..7dd866e1280 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 1abad5dedcf..2434a3709a8 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 3a2fd29cc5b..1a94d4fded4 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 c3de107d48d..ba273c75d26 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; |