staging: vt6656: Remove dead variable bCCK.

bCCK is always true remove all false conditions and
local variable.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c
index b4489d6c6c26198b79afe7c2c546824e315f5d04..a70b27890a09405f7009d196c50f5f748b39ddf9 100644 (file)
--- a/drivers/staging/vt6656/baseband.c
+++ b/drivers/staging/vt6656/baseband.c
@@ -737,7 +737,6 @@ void BBvCalculateParameter(struct vnt_private *pDevice, u32 cbFrameLength,
        u32 cbTmp;
        int bExtBit;
        u8 byPreambleType = pDevice->byPreambleType;
-       int bCCK = pDevice->bCCK;
 
     cbBitCount = cbFrameLength * 8;
     bExtBit = false;
@@ -757,8 +756,6 @@ void BBvCalculateParameter(struct vnt_private *pDevice, u32 cbFrameLength,
         break;
 
     case RATE_5M :
-        if (bCCK == false)
-            cbBitCount ++;
         cbUsCount = (cbBitCount * 10) / 55;
         cbTmp = (cbUsCount * 55) / 10;
         if (cbTmp != cbBitCount)
@@ -770,9 +767,6 @@ void BBvCalculateParameter(struct vnt_private *pDevice, u32 cbFrameLength,
         break;
 
     case RATE_11M :
-
-        if (bCCK == false)
-            cbBitCount ++;
         cbUsCount = cbBitCount / 11;
         cbTmp = cbUsCount * 11;
         if (cbTmp != cbBitCount) {

diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index 7e7ac8034581155b3ea5baba46896463e492ec93..824882487724c454483a2a86a7691e4dfe120356 100644 (file)
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
@@ -581,7 +581,6 @@ struct vnt_private {
 
        u32 dwMaxReceiveLifetime;  /* dot11MaxReceiveLifetime */
 
-       int bCCK;
        int bEncryptionEnable;
        int bShortSlotTime;
        int bProtectMode;

diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 3832bcb3d798e218e1614c55786c683c3dd064db..ea0c9e7c331e0f15c611a33805eb80d038806342 100644 (file)
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -368,8 +368,6 @@ static int device_init_registers(struct vnt_private *pDevice)
 
        /* do MACbSoftwareReset in MACvInitialize */
 
-       /* force CCK */
-       pDevice->bCCK = true;
        pDevice->bProtectMode = false;
        /* only used in 11g type, sync with ERP IE */
        pDevice->bNonERPPresent = false;

diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c
index 64edc16da7cefda7a8cbf9c61a77cf3cf449b7f5..d08f290868182656bf17af9641d72afd6b2325ec 100644 (file)
--- a/drivers/staging/vt6656/wmgr.c
+++ b/drivers/staging/vt6656/wmgr.c
@@ -2571,7 +2571,6 @@ static void s_vMgrSynchBSS(struct vnt_private *pDevice, u32 uBSSMode,
     }
 
     // Init the BSS informations
-    pDevice->bCCK = true;
     pDevice->bProtectMode = false;
     MACvDisableProtectMD(pDevice);
     pDevice->bBarkerPreambleMd = false;