Commit 5154b0d0 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

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: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9e9df670
...@@ -1837,7 +1837,6 @@ BBvCalculateParameter( ...@@ -1837,7 +1837,6 @@ BBvCalculateParameter(
unsigned int cbTmp; unsigned int cbTmp;
bool bExtBit; bool bExtBit;
unsigned char byPreambleType = pDevice->byPreambleType; unsigned char byPreambleType = pDevice->byPreambleType;
bool bCCK = pDevice->bCCK;
cbBitCount = cbFrameLength * 8; cbBitCount = cbFrameLength * 8;
bExtBit = false; bExtBit = false;
...@@ -1857,8 +1856,6 @@ BBvCalculateParameter( ...@@ -1857,8 +1856,6 @@ BBvCalculateParameter(
break; break;
case RATE_5M: case RATE_5M:
if (!bCCK)
cbBitCount++;
cbUsCount = (cbBitCount * 10) / 55; cbUsCount = (cbBitCount * 10) / 55;
cbTmp = (cbUsCount * 55) / 10; cbTmp = (cbUsCount * 55) / 10;
if (cbTmp != cbBitCount) if (cbTmp != cbBitCount)
...@@ -1870,9 +1867,6 @@ BBvCalculateParameter( ...@@ -1870,9 +1867,6 @@ BBvCalculateParameter(
break; break;
case RATE_11M: case RATE_11M:
if (!bCCK)
cbBitCount++;
cbUsCount = cbBitCount / 11; cbUsCount = cbBitCount / 11;
cbTmp = cbUsCount * 11; cbTmp = cbUsCount * 11;
if (cbTmp != cbBitCount) { if (cbTmp != cbBitCount) {
......
...@@ -488,7 +488,6 @@ struct vnt_private { ...@@ -488,7 +488,6 @@ struct vnt_private {
unsigned long dwMaxReceiveLifetime; // dot11MaxReceiveLifetime unsigned long dwMaxReceiveLifetime; // dot11MaxReceiveLifetime
bool bCCK;
bool bEncryptionEnable; bool bEncryptionEnable;
bool bLongHeader; bool bLongHeader;
bool bShortSlotTime; bool bShortSlotTime;
......
...@@ -469,8 +469,6 @@ static void device_init_registers(struct vnt_private *pDevice) ...@@ -469,8 +469,6 @@ static void device_init_registers(struct vnt_private *pDevice)
/* Do MACbSoftwareReset in MACvInitialize */ /* Do MACbSoftwareReset in MACvInitialize */
MACbSoftwareReset(pDevice->PortOffset); MACbSoftwareReset(pDevice->PortOffset);
/* force CCK */
pDevice->bCCK = true;
pDevice->bAES = false; pDevice->bAES = false;
/* Only used in 11g type, sync with ERP IE */ /* Only used in 11g type, sync with ERP IE */
......
...@@ -2663,7 +2663,6 @@ s_vMgrSynchBSS( ...@@ -2663,7 +2663,6 @@ s_vMgrSynchBSS(
} }
// Init the BSS informations // Init the BSS informations
pDevice->bCCK = true;
pDevice->bProtectMode = false; pDevice->bProtectMode = false;
MACvDisableProtectMD(pDevice->PortOffset); MACvDisableProtectMD(pDevice->PortOffset);
pDevice->bBarkerPreambleMd = false; pDevice->bBarkerPreambleMd = false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment