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>

diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c
index c1025ff542edeefa26214fa2275bb2066461b27f..7dd866e1280c3bd583cd584c182fa617364e6e96 100644 (file)
--- 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 1abad5dedcfc3fbb24ba17ebcedfd1b4017ca60d..2434a3709a82400f61cc8cf8e9b6eff137a902a9 100644 (file)
--- 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 3a2fd29cc5b92a188aa530b7486c89bb25d8b1d7..1a94d4fded4e48dfdc37a8bb6e721596d9006ddf 100644 (file)
--- 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 c3de107d48dbc3f98d4a8e101b30822e7ce43df4..ba273c75d2621e5cb4a0b89be0d7fc25da102b84 100644 (file)
--- 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;