Commit ab01fedc authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: rxtx.c s_uFillDataHead remove dead variables. 



As result of patches
staging: vt6656: rxtx.c: s_uGetDataDuration remove First Frag or Mid Frag dead code
staging: vt6656: rxtx.c: s_uGetDataDuration remove dead variables.

variables uFragIdx, cbLastFragmentSize, uMACfragNum are dead.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3ed210ef

drivers/staging/vt6656/rxtx.c

+5 −7
Original line number Diff line number Diff line
@@ -106,8 +106,7 @@ static void s_vGenerateTxParameter(struct vnt_private *pDevice, 


static u32 s_uFillDataHead(struct vnt_private *pDevice,

	u8 byPktType, u16 wCurrentRate, void *pTxDataHead, u32 cbFrameLength,

	u32 uDMAIdx, int bNeedAck, u32 uFragIdx, u32 cbLastFragmentSize,

	u32 uMACfragNum, u8 byFBOption);

	u32 uDMAIdx, int bNeedAck, u8 byFBOption);



static void s_vGenerateMACHeader(struct vnt_private *pDevice,

	u8 *pbyBufferAddr, u16 wDuration, struct ethhdr *psEthHeader,
@@ -525,8 +524,7 @@ static u32 s_uGetRTSCTSDuration(struct vnt_private *pDevice, u8 byDurType, 


static u32 s_uFillDataHead(struct vnt_private *pDevice,

	u8 byPktType, u16 wCurrentRate, void *pTxDataHead, u32 cbFrameLength,

	u32 uDMAIdx, int bNeedAck, u32 uFragIdx, u32 cbLastFragmentSize,

	u32 uMACfragNum, u8 byFBOption)

	u32 uDMAIdx, int bNeedAck, u8 byFBOption)

{



    if (pTxDataHead == NULL) {
@@ -1244,7 +1242,7 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType, 
                               cbFrameSize, bNeedACK, uDMAIdx, psEthHeader);

    //Fill DataHead

    uDuration = s_uFillDataHead(pDevice, byPktType, wCurrentRate, pvTxDataHd, cbFrameSize, uDMAIdx, bNeedACK,

                                    0, 0, 1/*uMACfragNum*/, byFBOption);

				byFBOption);

    // Generate TX MAC Header

    s_vGenerateMACHeader(pDevice, pbyMacHdr, (u16)uDuration, psEthHeader, bNeedEncryption,

                           byFragType, uDMAIdx, 0);
@@ -1663,7 +1661,7 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice, 


    //Fill DataHead

    uDuration = s_uFillDataHead(pDevice, byPktType, wCurrentRate, pvTxDataHd, cbFrameSize, TYPE_TXDMA0, bNeedACK,

                                0, 0, 1, AUTO_FB_NONE);

				AUTO_FB_NONE);



    pMACHeader = (struct ieee80211_hdr *) (pbyTxBufferAddr + cbHeaderSize);
@@ -2063,7 +2061,7 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb) 


    //Fill DataHead

    uDuration = s_uFillDataHead(pDevice, byPktType, wCurrentRate, pvTxDataHd, cbFrameSize, TYPE_TXDMA0, bNeedACK,

                                0, 0, 1, AUTO_FB_NONE);

				AUTO_FB_NONE);



    pMACHeader = (struct ieee80211_hdr *) (pbyTxBufferAddr + cbHeaderSize);