stgaing: vt6655: remove unused variable wCTSDuration

wCTSDuration is always set to 0.

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

diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 8ac790124eef81515fb1a7d230574740153c379a..15303d904ec15fd27484ec20d409698baeab4e9f 100644 (file)
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -476,7 +476,6 @@ struct vnt_private {
        unsigned short wMaxTransmitMSDULifetime;
        unsigned char abyBSSID[ETH_ALEN];
        unsigned char abyDesireBSSID[ETH_ALEN];
-       unsigned short wCTSDuration;       // update while speed change
        unsigned short wACKDuration;       // update while speed change
        unsigned short wRTSTransmitLen;    // update while speed change
        unsigned char byRTSServiceField;  // update while speed change

diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 34a70b04a1098b6d8653b6402b9ce07192c203a5..047370274c00a96cb6d6232736b83164338bedba 100644 (file)
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -387,7 +387,6 @@ device_set_options(struct vnt_private *pDevice)
        pDevice->byAutoFBCtrl = AUTO_FB_0;
        pDevice->bUpdateBBVGA = true;
        pDevice->byFOETuning = 0;
-       pDevice->wCTSDuration = 0;
        pDevice->byPreambleType = 0;
 
        pr_debug(" uChannel= %d\n", (int)pDevice->uChannel);

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 6b22f09e0827901d3150fdd3712e30b65e691bd3..3c8c4998fe26393f9added72f77452f203043056 100644 (file)
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -1051,22 +1051,17 @@ s_vFillCTSHead(
 
                        buf->duration_ba = (u16)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength,
                                                                     byPktType, wCurrentRate, bNeedAck, byFBOption);
-                       buf->duration_ba += pDevice->wCTSDuration;
-
                        buf->duration_ba = cpu_to_le16(buf->duration_ba);
                        /* Get CTSDuration_ba_f0 */
                        buf->cts_duration_ba_f0 = (u16)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA_F0, cbFrameLength,
                                                                            byPktType, wCurrentRate,
                                                                            bNeedAck, byFBOption);
 
-                       buf->cts_duration_ba_f0 += pDevice->wCTSDuration;
-
                        buf->cts_duration_ba_f0 = cpu_to_le16(buf->cts_duration_ba_f0);
                        //Get CTSDuration_ba_f1
                        buf->cts_duration_ba_f1 = (u16)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA_F1, cbFrameLength,
                                                                            byPktType, wCurrentRate,
                                                                            bNeedAck, byFBOption);
-                       buf->cts_duration_ba_f1 += pDevice->wCTSDuration;
 
                        buf->cts_duration_ba_f1 = cpu_to_le16(buf->cts_duration_ba_f1);
                        /* Get CTS Frame body */
@@ -1091,7 +1086,7 @@ s_vFillCTSHead(
                                cpu_to_le16((u16)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength,
                                                                      byPktType, wCurrentRate, bNeedAck,
                                                                      byFBOption));
-                       buf->duration_ba += pDevice->wCTSDuration;
+
                        buf->duration_ba = cpu_to_le16(buf->duration_ba);
 
                        /* Get CTS Frame body */