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

staging: vt6656: rxtx: Remove unused uDMAIdx from driver. 



Remove from functions and callers.

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

drivers/staging/vt6656/main_usb.c

+1 −1
Original line number Diff line number Diff line
@@ -1192,7 +1192,7 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) 
		goto out;

	}



	if (nsDMA_tx_packet(pDevice, TYPE_AC0DMA, skb)) {

	if (nsDMA_tx_packet(pDevice, skb)) {

		if (netif_queue_stopped(dev))

			netif_wake_queue(dev);

	}

drivers/staging/vt6656/rxtx.c

+15 −18
Original line number Diff line number Diff line
@@ -101,11 +101,11 @@ static struct vnt_usb_send_context *s_vGetFreeContext(struct vnt_private *); 
static u16 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, u32 cbFrameSize,

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

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



static void s_vGenerateMACHeader(struct vnt_private *pDevice,

	u8 *pbyBufferAddr, u16 wDuration, struct ethhdr *psEthHeader,

	int bNeedEncrypt, u16 wFragType, u32 uDMAIdx, u32 uFragIdx);

	int bNeedEncrypt, u16 wFragType, u32 uFragIdx);



static void s_vFillTxKey(struct vnt_private *pDevice,

	struct vnt_tx_fifo_head *fifo_head, u8 *pbyIVHead,
@@ -121,7 +121,7 @@ static unsigned int s_uGetTxRsvTime(struct vnt_private *pDevice, u8 byPktType, 
static __le16 s_uGetRTSCTSRsvTime(struct vnt_private *priv,

	u8 rsv_type, u8 pkt_type, u32 frame_lenght, u16 current_rate);



static u16 s_vFillCTSHead(struct vnt_private *pDevice, u32 uDMAIdx,

static u16 s_vFillCTSHead(struct vnt_private *pDevice,

	u8 byPktType, union vnt_tx_data_head *head, u32 cbFrameLength,

	int bNeedAck, u16 wCurrentRate, u8 byFBOption);
@@ -714,7 +714,7 @@ static u16 s_vFillRTSHead(struct vnt_private *pDevice, u8 byPktType, 
	return 0;

}



static u16 s_vFillCTSHead(struct vnt_private *pDevice, u32 uDMAIdx,

static u16 s_vFillCTSHead(struct vnt_private *pDevice,

	u8 byPktType, union vnt_tx_data_head *head, u32 cbFrameLength,

	int bNeedAck, u16 wCurrentRate, u8 byFBOption)

{
@@ -787,7 +787,6 @@ static u16 s_vFillCTSHead(struct vnt_private *pDevice, u32 uDMAIdx, 
 *      pCTS            - CTS Buffer

 *      cbFrameSize     - Transmit Data Length (Hdr+Payload+FCS)

 *      bNeedACK        - If need ACK

 *      uDMAIdx         - DMA Index

 *  Out:

 *      none

 *
@@ -798,7 +797,7 @@ static u16 s_vFillCTSHead(struct vnt_private *pDevice, u32 uDMAIdx, 
static u16 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, u32 cbFrameSize,

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

	int bNeedACK, struct ethhdr *psEthHeader, bool need_rts)

{

	struct vnt_tx_fifo_head *pFifoHead = &tx_buffer->fifo_head;

	union vnt_tx_data_head *head = NULL;
@@ -866,7 +865,7 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice, 
			}



			/* Fill CTS */

			return s_vFillCTSHead(pDevice, uDMAIdx, byPktType,

			return s_vFillCTSHead(pDevice, byPktType,

				head, cbFrameSize, bNeedACK, wCurrentRate,

					byFBOption);

		}
@@ -951,7 +950,7 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice, 


static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType,

	struct vnt_tx_buffer *tx_buffer, int bNeedEncryption,

	u32 uSkbPacketLen, u32 uDMAIdx,	struct ethhdr *psEthHeader,

	u32 uSkbPacketLen, struct ethhdr *psEthHeader,

	u8 *pPacket, PSKeyItem pTransmitKey, u32 uNodeIndex, u16 wCurrentRate,

	u32 *pcbHeaderLen, u32 *pcbTotalLen)

{
@@ -1147,17 +1146,16 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType, 
    //=========================

    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"No Fragmentation...\n");

    byFragType = FRAGCTL_NONFRAG;

    //uDMAIdx = TYPE_AC0DMA;

    //pTxBufHead = (PSTxBufHead) &(pTxBufHead->adwTxKey[0]);



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

	uDuration = s_vGenerateTxParameter(pDevice, byPktType, wCurrentRate,

			tx_buffer, &pMICHDR, cbMICHDR,

			cbFrameSize, bNeedACK, uDMAIdx, psEthHeader, bRTS);

			cbFrameSize, bNeedACK, psEthHeader, bRTS);



    // Generate TX MAC Header

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

                           byFragType, uDMAIdx, 0);

		byFragType, 0);



    if (bNeedEncryption == true) {

        //Fill TXKEY
@@ -1289,7 +1287,7 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType, 


static void s_vGenerateMACHeader(struct vnt_private *pDevice,

	u8 *pbyBufferAddr, u16 wDuration, struct ethhdr *psEthHeader,

	int bNeedEncrypt, u16 wFragType, u32 uDMAIdx, u32 uFragIdx)

	int bNeedEncrypt, u16 wFragType, u32 uFragIdx)

{

	struct ieee80211_hdr *pMACHeader = (struct ieee80211_hdr *)pbyBufferAddr;
@@ -1529,7 +1527,7 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice, 
	/* Fill FIFO,RrvTime,RTS,and CTS */

	uDuration = s_vGenerateTxParameter(pDevice, byPktType, wCurrentRate,

		pTX_Buffer, &pMICHDR, 0,

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

		cbFrameSize, bNeedACK, &sEthHeader, false);



    pMACHeader = (struct ieee80211_hdr *) (pbyTxBufferAddr + cbHeaderSize);
@@ -1923,7 +1921,7 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb) 
	/* Fill FIFO,RrvTime,RTS,and CTS */

	uDuration = s_vGenerateTxParameter(pDevice, byPktType, wCurrentRate,

		pTX_Buffer, &pMICHDR, cbMICHDR,

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

		cbFrameSize, bNeedACK, &sEthHeader, false);



	pMACHeader = (struct ieee80211_hdr *) (pbyTxBufferAddr + cbHeaderSize);
@@ -2085,8 +2083,7 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb) 
 * Return Value: NULL

 */



int nsDMA_tx_packet(struct vnt_private *pDevice,

	u32 uDMAIdx, struct sk_buff *skb)

int nsDMA_tx_packet(struct vnt_private *pDevice, struct sk_buff *skb)

{

	struct net_device_stats *pStats = &pDevice->stats;

	struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;
@@ -2417,7 +2414,7 @@ int nsDMA_tx_packet(struct vnt_private *pDevice, 


    fConvertedPacket = s_bPacketToWirelessUsb(pDevice, byPktType,

			pTX_Buffer, bNeedEncryption,

                        skb->len, uDMAIdx, &pDevice->sTxEthHeader,

			skb->len, &pDevice->sTxEthHeader,

                        (u8 *)skb->data, pTransmitKey, uNodeIndex,

                        pDevice->wCurrentRate,

                        &uHeaderLen, &BytesToWrite
@@ -2581,7 +2578,7 @@ int bRelayPacketSend(struct vnt_private *pDevice, u8 *pbySkbData, u32 uDataLen, 


    fConvertedPacket = s_bPacketToWirelessUsb(pDevice, byPktType,

			pTX_Buffer, bNeedEncryption,

                         uDataLen, TYPE_AC0DMA, &pDevice->sTxEthHeader,

			uDataLen, &pDevice->sTxEthHeader,

                         pbySkbData, pTransmitKey, uNodeIndex,

                         pDevice->wCurrentRate,

                         &uHeaderLen, &BytesToWrite

drivers/staging/vt6656/rxtx.h

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ struct vnt_beacon_buffer { 
} __packed;



void vDMA0_tx_80211(struct vnt_private *, struct sk_buff *skb);

int nsDMA_tx_packet(struct vnt_private *, u32 uDMAIdx, struct sk_buff *skb);

int nsDMA_tx_packet(struct vnt_private *, struct sk_buff *skb);

CMD_STATUS csMgmt_xmit(struct vnt_private *, struct vnt_tx_mgmt *);

CMD_STATUS csBeacon_xmit(struct vnt_private *, struct vnt_tx_mgmt *);

int bRelayPacketSend(struct vnt_private *, u8 *pbySkbData, u32 uDataLen,

drivers/staging/vt6656/wcmd.c

+2 −2
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ void vRunCommand(struct work_struct *work) 
					pDevice->bMoreData = true;

				}



				if (nsDMA_tx_packet(pDevice, TYPE_AC0DMA, skb) != 0)

				if (nsDMA_tx_packet(pDevice, skb) != 0)

					DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Multicast ps tx fail\n");



				pMgmt->sNodeDBTable[0].wEnQueueCnt--;
@@ -698,7 +698,7 @@ void vRunCommand(struct work_struct *work) 
						pDevice->bMoreData = true;

					}



					if (nsDMA_tx_packet(pDevice, TYPE_AC0DMA, skb) != 0)

					if (nsDMA_tx_packet(pDevice, skb) != 0)

						DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "sta ps tx fail\n");



					pMgmt->sNodeDBTable[ii].wEnQueueCnt--;