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

staging: vt6656: rxtx.c remove dead code rts_cts void 



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

drivers/staging/vt6656/rxtx.c

+7 −12
Original line number Diff line number Diff line
@@ -100,9 +100,8 @@ static void *s_vGetFreeContext(struct vnt_private *pDevice); 


static void s_vGenerateTxParameter(struct vnt_private *pDevice,

	u8 byPktType, u16 wCurrentRate,	struct vnt_tx_buffer *tx_buffer,

	struct vnt_mic_hdr **mic_hdr, u32 need_mic,

	void *rts_cts, u32 cbFrameSize, int bNeedACK, u32 uDMAIdx,

	struct ethhdr *psEthHeader, bool need_rts);

	struct vnt_mic_hdr **mic_hdr, u32 need_mic, u32 cbFrameSize,

	int bNeedACK, u32 uDMAIdx, struct ethhdr *psEthHeader, bool need_rts);



static u32 s_uFillDataHead(struct vnt_private *pDevice,

	u8 byPktType, u16 wCurrentRate, void *pTxDataHead, u32 cbFrameLength,
@@ -842,9 +841,8 @@ static void s_vFillCTSHead(struct vnt_private *pDevice, u32 uDMAIdx, 


static void s_vGenerateTxParameter(struct vnt_private *pDevice,

	u8 byPktType, u16 wCurrentRate,	struct vnt_tx_buffer *tx_buffer,

	struct vnt_mic_hdr **mic_hdr, u32 need_mic,

	void *rts_cts, u32 cbFrameSize, int bNeedACK, u32 uDMAIdx,

	struct ethhdr *psEthHeader, bool need_rts)

	struct vnt_mic_hdr **mic_hdr, u32 need_mic, u32 cbFrameSize,

	int bNeedACK, u32 uDMAIdx, struct ethhdr *psEthHeader, bool need_rts)

{

	struct vnt_tx_fifo_head *pFifoHead = &tx_buffer->fifo_head;

	union vnt_tx_data_head *head = NULL;
@@ -1013,7 +1011,6 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType, 
	u32 uDuration;

	u32 cbHeaderLength = 0, uPadding = 0;

	struct vnt_mic_hdr *pMICHDR;

	void *rts_cts = NULL;

	void *pvTxDataHd;

	u8 byFBOption = AUTO_FB_NONE, byFragType;

	u16 wTxBufSize;
@@ -1232,7 +1229,7 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType, 


    //Fill FIFO,RrvTime,RTS,and CTS

    s_vGenerateTxParameter(pDevice, byPktType, wCurrentRate,

		tx_buffer, &pMICHDR, cbMICHDR, rts_cts,

		tx_buffer, &pMICHDR, cbMICHDR,

		cbFrameSize, bNeedACK, uDMAIdx, psEthHeader, bRTS);

    //Fill DataHead

    uDuration = s_uFillDataHead(pDevice, byPktType, wCurrentRate, pvTxDataHd, cbFrameSize, uDMAIdx, bNeedACK,
@@ -1469,7 +1466,6 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice, 
	struct ieee80211_hdr *pMACHeader;

	struct ethhdr sEthHeader;

	u8 byPktType, *pbyTxBufferAddr;

	void *rts_cts = NULL;

	void *pvTxDataHd;

	struct vnt_mic_hdr *pMICHDR = NULL;

	u32 uDuration, cbReqCount, cbHeaderSize, cbFrameBodySize, cbFrameSize;
@@ -1628,7 +1624,7 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice, 


	/* Fill FIFO,RrvTime,RTS,and CTS */

	s_vGenerateTxParameter(pDevice, byPktType, wCurrentRate,

		pTX_Buffer, &pMICHDR, 0, rts_cts,

		pTX_Buffer, &pMICHDR, 0,

		cbFrameSize, bNeedACK, TYPE_TXDMA0, &sEthHeader, false);



    //Fill DataHead
@@ -1821,7 +1817,6 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb) 
	struct vnt_tx_fifo_head *pTxBufHead;

	u8 byPktType;

	u8 *pbyTxBufferAddr;

	void *rts_cts = NULL;

	void *pvTxDataHd;

	u32 uDuration, cbReqCount;

	struct ieee80211_hdr *pMACHeader;
@@ -2033,7 +2028,7 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb) 


	/* Fill FIFO,RrvTime,RTS,and CTS */

	s_vGenerateTxParameter(pDevice, byPktType, wCurrentRate,

		pTX_Buffer, &pMICHDR, cbMICHDR, rts_cts,

		pTX_Buffer, &pMICHDR, cbMICHDR,

		cbFrameSize, bNeedACK, TYPE_TXDMA0, &sEthHeader, false);



    //Fill DataHead