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

staging: vt6656: Remove dead variable bCCK.

bCCK is always true remove all false conditions and
local variable.
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a0522e88
...@@ -737,7 +737,6 @@ void BBvCalculateParameter(struct vnt_private *pDevice, u32 cbFrameLength, ...@@ -737,7 +737,6 @@ void BBvCalculateParameter(struct vnt_private *pDevice, u32 cbFrameLength,
u32 cbTmp; u32 cbTmp;
int bExtBit; int bExtBit;
u8 byPreambleType = pDevice->byPreambleType; u8 byPreambleType = pDevice->byPreambleType;
int bCCK = pDevice->bCCK;
cbBitCount = cbFrameLength * 8; cbBitCount = cbFrameLength * 8;
bExtBit = false; bExtBit = false;
...@@ -757,8 +756,6 @@ void BBvCalculateParameter(struct vnt_private *pDevice, u32 cbFrameLength, ...@@ -757,8 +756,6 @@ void BBvCalculateParameter(struct vnt_private *pDevice, u32 cbFrameLength,
break; break;
case RATE_5M : case RATE_5M :
if (bCCK == false)
cbBitCount ++;
cbUsCount = (cbBitCount * 10) / 55; cbUsCount = (cbBitCount * 10) / 55;
cbTmp = (cbUsCount * 55) / 10; cbTmp = (cbUsCount * 55) / 10;
if (cbTmp != cbBitCount) if (cbTmp != cbBitCount)
...@@ -770,9 +767,6 @@ void BBvCalculateParameter(struct vnt_private *pDevice, u32 cbFrameLength, ...@@ -770,9 +767,6 @@ void BBvCalculateParameter(struct vnt_private *pDevice, u32 cbFrameLength,
break; break;
case RATE_11M : case RATE_11M :
if (bCCK == false)
cbBitCount ++;
cbUsCount = cbBitCount / 11; cbUsCount = cbBitCount / 11;
cbTmp = cbUsCount * 11; cbTmp = cbUsCount * 11;
if (cbTmp != cbBitCount) { if (cbTmp != cbBitCount) {
......
...@@ -581,7 +581,6 @@ struct vnt_private { ...@@ -581,7 +581,6 @@ struct vnt_private {
u32 dwMaxReceiveLifetime; /* dot11MaxReceiveLifetime */ u32 dwMaxReceiveLifetime; /* dot11MaxReceiveLifetime */
int bCCK;
int bEncryptionEnable; int bEncryptionEnable;
int bShortSlotTime; int bShortSlotTime;
int bProtectMode; int bProtectMode;
......
...@@ -368,8 +368,6 @@ static int device_init_registers(struct vnt_private *pDevice) ...@@ -368,8 +368,6 @@ static int device_init_registers(struct vnt_private *pDevice)
/* do MACbSoftwareReset in MACvInitialize */ /* do MACbSoftwareReset in MACvInitialize */
/* force CCK */
pDevice->bCCK = true;
pDevice->bProtectMode = false; pDevice->bProtectMode = false;
/* only used in 11g type, sync with ERP IE */ /* only used in 11g type, sync with ERP IE */
pDevice->bNonERPPresent = false; pDevice->bNonERPPresent = false;
......
...@@ -2571,7 +2571,6 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode, ...@@ -2571,7 +2571,6 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode,
} }
// Init the BSS informations // Init the BSS informations
pDevice->bCCK = true;
pDevice->bProtectMode = false; pDevice->bProtectMode = false;
MACvDisableProtectMD(pDevice); MACvDisableProtectMD(pDevice);
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