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

stgaing: vt6655: remove unused variable wCTSDuration

wCTSDuration is always set to 0.
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent db1afd18
...@@ -476,7 +476,6 @@ struct vnt_private { ...@@ -476,7 +476,6 @@ struct vnt_private {
unsigned short wMaxTransmitMSDULifetime; unsigned short wMaxTransmitMSDULifetime;
unsigned char abyBSSID[ETH_ALEN]; unsigned char abyBSSID[ETH_ALEN];
unsigned char abyDesireBSSID[ETH_ALEN]; unsigned char abyDesireBSSID[ETH_ALEN];
unsigned short wCTSDuration; // update while speed change
unsigned short wACKDuration; // update while speed change unsigned short wACKDuration; // update while speed change
unsigned short wRTSTransmitLen; // update while speed change unsigned short wRTSTransmitLen; // update while speed change
unsigned char byRTSServiceField; // update while speed change unsigned char byRTSServiceField; // update while speed change
......
...@@ -387,7 +387,6 @@ device_set_options(struct vnt_private *pDevice) ...@@ -387,7 +387,6 @@ device_set_options(struct vnt_private *pDevice)
pDevice->byAutoFBCtrl = AUTO_FB_0; pDevice->byAutoFBCtrl = AUTO_FB_0;
pDevice->bUpdateBBVGA = true; pDevice->bUpdateBBVGA = true;
pDevice->byFOETuning = 0; pDevice->byFOETuning = 0;
pDevice->wCTSDuration = 0;
pDevice->byPreambleType = 0; pDevice->byPreambleType = 0;
pr_debug(" uChannel= %d\n", (int)pDevice->uChannel); pr_debug(" uChannel= %d\n", (int)pDevice->uChannel);
......
...@@ -1051,22 +1051,17 @@ s_vFillCTSHead( ...@@ -1051,22 +1051,17 @@ s_vFillCTSHead(
buf->duration_ba = (u16)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength, buf->duration_ba = (u16)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength,
byPktType, wCurrentRate, bNeedAck, byFBOption); byPktType, wCurrentRate, bNeedAck, byFBOption);
buf->duration_ba += pDevice->wCTSDuration;
buf->duration_ba = cpu_to_le16(buf->duration_ba); buf->duration_ba = cpu_to_le16(buf->duration_ba);
/* Get CTSDuration_ba_f0 */ /* Get CTSDuration_ba_f0 */
buf->cts_duration_ba_f0 = (u16)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA_F0, cbFrameLength, buf->cts_duration_ba_f0 = (u16)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA_F0, cbFrameLength,
byPktType, wCurrentRate, byPktType, wCurrentRate,
bNeedAck, byFBOption); bNeedAck, byFBOption);
buf->cts_duration_ba_f0 += pDevice->wCTSDuration;
buf->cts_duration_ba_f0 = cpu_to_le16(buf->cts_duration_ba_f0); buf->cts_duration_ba_f0 = cpu_to_le16(buf->cts_duration_ba_f0);
//Get CTSDuration_ba_f1 //Get CTSDuration_ba_f1
buf->cts_duration_ba_f1 = (u16)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA_F1, cbFrameLength, buf->cts_duration_ba_f1 = (u16)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA_F1, cbFrameLength,
byPktType, wCurrentRate, byPktType, wCurrentRate,
bNeedAck, byFBOption); bNeedAck, byFBOption);
buf->cts_duration_ba_f1 += pDevice->wCTSDuration;
buf->cts_duration_ba_f1 = cpu_to_le16(buf->cts_duration_ba_f1); buf->cts_duration_ba_f1 = cpu_to_le16(buf->cts_duration_ba_f1);
/* Get CTS Frame body */ /* Get CTS Frame body */
...@@ -1091,7 +1086,7 @@ s_vFillCTSHead( ...@@ -1091,7 +1086,7 @@ s_vFillCTSHead(
cpu_to_le16((u16)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength, cpu_to_le16((u16)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength,
byPktType, wCurrentRate, bNeedAck, byPktType, wCurrentRate, bNeedAck,
byFBOption)); byFBOption));
buf->duration_ba += pDevice->wCTSDuration;
buf->duration_ba = cpu_to_le16(buf->duration_ba); buf->duration_ba = cpu_to_le16(buf->duration_ba);
/* Get CTS Frame body */ /* Get CTS Frame body */
......
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