diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2013-08-24 12:56:11 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-26 06:25:34 -0700 |
| commit | 09bd0f3563dc49513ebc01975985fc74a8757d34 (patch) | |
| tree | 562de883502aa674e45553969ec006804d5fe91e /drivers/staging/vt6656 | |
| parent | fedbfe7eb8deb73719307cb2369669fe94270a10 (diff) | |
staging: vt6656: rxtx.c s_vFillCTSHead remove dead code bDisCRC
As result of patch
vt6656: device.h Remove dead code bSoftwareGenCrcErr.
dDiscCRC is unused.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656')
| -rw-r--r-- | drivers/staging/vt6656/rxtx.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 1b2effc050ee..7b94a775cbde 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -126,7 +126,7 @@ static u16 s_uGetRTSCTSRsvTime(struct vnt_private *pDevice, u8 byRTSRsvType, static void s_vFillCTSHead(struct vnt_private *pDevice, u32 uDMAIdx, u8 byPktType, void *pvCTS, u32 cbFrameLength, int bNeedAck, - int bDisCRC, u16 wCurrentRate, u8 byFBOption); + u16 wCurrentRate, u8 byFBOption); static void s_vFillRTSHead(struct vnt_private *pDevice, u8 byPktType, void *pvRTS, u32 cbFrameLength, int bNeedAck, @@ -769,7 +769,7 @@ static void s_vFillRTSHead(struct vnt_private *pDevice, u8 byPktType, static void s_vFillCTSHead(struct vnt_private *pDevice, u32 uDMAIdx, u8 byPktType, void *pvCTS, u32 cbFrameLength, int bNeedAck, - int bDisCRC, u16 wCurrentRate, u8 byFBOption) + u16 wCurrentRate, u8 byFBOption) { u32 uCTSFrameLen = 14; @@ -777,12 +777,6 @@ static void s_vFillCTSHead(struct vnt_private *pDevice, u32 uDMAIdx, return; } - if (bDisCRC) { - // When CRCDIS bit is on, H/W forgot to generate FCS for CTS frame, - // in this case we need to decrease its length by 4. - uCTSFrameLen -= 4; - } - if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) { if (byFBOption != AUTO_FB_NONE) { /* Auto Fall back */ @@ -912,7 +906,8 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice, byPktType, cbFrameSize, wCurrentRate); } //Fill CTS - s_vFillCTSHead(pDevice, uDMAIdx, byPktType, pvCTS, cbFrameSize, bNeedACK, bDisCRC, wCurrentRate, byFBOption); + s_vFillCTSHead(pDevice, uDMAIdx, byPktType, pvCTS, cbFrameSize, + bNeedACK, wCurrentRate, byFBOption); } } else if (byPktType == PK_TYPE_11A) { |