diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2013-08-24 11:50:50 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-26 13:25:33 (GMT) |
| commit | fedbfe7eb8deb73719307cb2369669fe94270a10 (patch) | |
| tree | 42c60c2f68addc803a1558db24fd3cde1919d03e /drivers | |
| parent | 4235f72fbcabebfeabb65cb7a740985337a1a1d4 (diff) | |
| download | linux-fsl-qoriq-fedbfe7eb8deb73719307cb2369669fe94270a10.tar.xz | |
staging: vt6656: rxtx.c s_vFillRTSHead remove dead bDiscCRC
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')
| -rw-r--r-- | drivers/staging/vt6656/rxtx.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 80741c0..1b2effc 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -129,7 +129,7 @@ static void s_vFillCTSHead(struct vnt_private *pDevice, u32 uDMAIdx, int bDisCRC, u16 wCurrentRate, u8 byFBOption); static void s_vFillRTSHead(struct vnt_private *pDevice, u8 byPktType, - void *pvRTS, u32 cbFrameLength, int bNeedAck, int bDisCRC, + void *pvRTS, u32 cbFrameLength, int bNeedAck, struct ethhdr *psEthHeader, u16 wCurrentRate, u8 byFBOption); static u16 s_uGetDataDuration(struct vnt_private *pDevice, @@ -596,7 +596,7 @@ static u32 s_uFillDataHead(struct vnt_private *pDevice, } static void s_vFillRTSHead(struct vnt_private *pDevice, u8 byPktType, - void *pvRTS, u32 cbFrameLength, int bNeedAck, int bDisCRC, + void *pvRTS, u32 cbFrameLength, int bNeedAck, struct ethhdr *psEthHeader, u16 wCurrentRate, u8 byFBOption) { u32 uRTSFrameLen = 20; @@ -604,12 +604,6 @@ static void s_vFillRTSHead(struct vnt_private *pDevice, u8 byPktType, if (pvRTS == NULL) return; - if (bDisCRC) { - // When CRCDIS bit is on, H/W forgot to generate FCS for RTS frame, - // in this case we need to decrease its length by 4. - uRTSFrameLen -= 4; - } - // Note: So far RTSHead doesn't appear in ATIM & Beacom DMA, so we don't need to take them into account. // Otherwise, we need to modified codes for them. if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) { @@ -900,7 +894,8 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice, bNeedACK); } //Fill RTS - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, + psEthHeader, wCurrentRate, byFBOption); } else {//RTS_needless, PCF mode @@ -933,7 +928,8 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice, cbFrameSize, wCurrentRate, bNeedACK); } //Fill RTS - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, + psEthHeader, wCurrentRate, byFBOption); } else if (pvRTS == NULL) {//RTS_needless, non PCF mode //Fill RsvTime @@ -958,7 +954,8 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice, cbFrameSize, wCurrentRate, bNeedACK); } //Fill RTS - s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); + s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, + psEthHeader, wCurrentRate, byFBOption); } else { //RTS_needless, non PCF mode //Fill RsvTime |