diff options
author | Malcolm Priestley <tvboxspy@gmail.com> | 2013-07-30 16:03:13 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-31 20:42:51 -0400 |
commit | 2cf8ed6031522ee62a09c539f275f05c3b64d95a (patch) | |
tree | 0697d3ce718845c90093725b3a630cab36940293 | |
parent | 7ee9ded220199f3be0b5d587ff9e2a1fdf7b6e2c (diff) |
staging: vt6656: dead code wCTSDuration.
Always set to zero, so remove.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/vt6656/device.h | 1 | ||||
-rw-r--r-- | drivers/staging/vt6656/main_usb.c | 1 | ||||
-rw-r--r-- | drivers/staging/vt6656/rxtx.c | 4 |
3 files changed, 0 insertions, 6 deletions
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index f07ba242811b..5324c2414baa 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h | |||
@@ -591,7 +591,6 @@ struct vnt_private { | |||
591 | u8 abyBSSID[ETH_ALEN]; | 591 | u8 abyBSSID[ETH_ALEN]; |
592 | u8 abyDesireBSSID[ETH_ALEN]; | 592 | u8 abyDesireBSSID[ETH_ALEN]; |
593 | 593 | ||
594 | u16 wCTSDuration; /* update while speed change */ | ||
595 | u16 wACKDuration; | 594 | u16 wACKDuration; |
596 | u16 wRTSTransmitLen; | 595 | u16 wRTSTransmitLen; |
597 | u8 byRTSServiceField; | 596 | u8 byRTSServiceField; |
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index 0c9e60fd57f7..3bc5834a13cc 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c | |||
@@ -267,7 +267,6 @@ device_set_options(struct vnt_private *pDevice) { | |||
267 | pDevice->bUpdateBBVGA = true; | 267 | pDevice->bUpdateBBVGA = true; |
268 | pDevice->byFOETuning = 0; | 268 | pDevice->byFOETuning = 0; |
269 | pDevice->byAutoPwrTunning = 0; | 269 | pDevice->byAutoPwrTunning = 0; |
270 | pDevice->wCTSDuration = 0; | ||
271 | pDevice->byPreambleType = 0; | 270 | pDevice->byPreambleType = 0; |
272 | pDevice->bExistSWNetAddr = false; | 271 | pDevice->bExistSWNetAddr = false; |
273 | /* pDevice->bDiversityRegCtlON = true; */ | 272 | /* pDevice->bDiversityRegCtlON = true; */ |
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 00e0c7118776..be0c9ce5af06 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c | |||
@@ -1005,15 +1005,12 @@ static void s_vFillCTSHead(struct vnt_private *pDevice, u32 uDMAIdx, | |||
1005 | ); | 1005 | ); |
1006 | pBuf->wTransmitLength_b = cpu_to_le16(wLen); | 1006 | pBuf->wTransmitLength_b = cpu_to_le16(wLen); |
1007 | pBuf->wDuration_ba = (u16)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption); //3:CTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data | 1007 | pBuf->wDuration_ba = (u16)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption); //3:CTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data |
1008 | pBuf->wDuration_ba += pDevice->wCTSDuration; | ||
1009 | pBuf->wDuration_ba = cpu_to_le16(pBuf->wDuration_ba); | 1008 | pBuf->wDuration_ba = cpu_to_le16(pBuf->wDuration_ba); |
1010 | //Get CTSDuration_ba_f0 | 1009 | //Get CTSDuration_ba_f0 |
1011 | pBuf->wCTSDuration_ba_f0 = (u16)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption); //8:CTSDuration_ba_f0, 1:2.4G, 2,3:2.4G OFDM Data | 1010 | pBuf->wCTSDuration_ba_f0 = (u16)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption); //8:CTSDuration_ba_f0, 1:2.4G, 2,3:2.4G OFDM Data |
1012 | pBuf->wCTSDuration_ba_f0 += pDevice->wCTSDuration; | ||
1013 | pBuf->wCTSDuration_ba_f0 = cpu_to_le16(pBuf->wCTSDuration_ba_f0); | 1011 | pBuf->wCTSDuration_ba_f0 = cpu_to_le16(pBuf->wCTSDuration_ba_f0); |
1014 | //Get CTSDuration_ba_f1 | 1012 | //Get CTSDuration_ba_f1 |
1015 | pBuf->wCTSDuration_ba_f1 = (u16)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption); //9:CTSDuration_ba_f1, 1:2.4G, 2,3:2.4G OFDM Data | 1013 | pBuf->wCTSDuration_ba_f1 = (u16)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption); //9:CTSDuration_ba_f1, 1:2.4G, 2,3:2.4G OFDM Data |
1016 | pBuf->wCTSDuration_ba_f1 += pDevice->wCTSDuration; | ||
1017 | pBuf->wCTSDuration_ba_f1 = cpu_to_le16(pBuf->wCTSDuration_ba_f1); | 1014 | pBuf->wCTSDuration_ba_f1 = cpu_to_le16(pBuf->wCTSDuration_ba_f1); |
1018 | //Get CTS Frame body | 1015 | //Get CTS Frame body |
1019 | pBuf->Data.wDurationID = pBuf->wDuration_ba; | 1016 | pBuf->Data.wDurationID = pBuf->wDuration_ba; |
@@ -1031,7 +1028,6 @@ static void s_vFillCTSHead(struct vnt_private *pDevice, u32 uDMAIdx, | |||
1031 | pBuf->wTransmitLength_b = cpu_to_le16(wLen); | 1028 | pBuf->wTransmitLength_b = cpu_to_le16(wLen); |
1032 | //Get CTSDuration_ba | 1029 | //Get CTSDuration_ba |
1033 | pBuf->wDuration_ba = cpu_to_le16((u16)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //3:CTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data | 1030 | pBuf->wDuration_ba = cpu_to_le16((u16)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //3:CTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data |
1034 | pBuf->wDuration_ba += pDevice->wCTSDuration; | ||
1035 | pBuf->wDuration_ba = cpu_to_le16(pBuf->wDuration_ba); | 1031 | pBuf->wDuration_ba = cpu_to_le16(pBuf->wDuration_ba); |
1036 | 1032 | ||
1037 | //Get CTS Frame body | 1033 | //Get CTS Frame body |