staging: vt6656: rxtx.c remove dead code s_uFillDataHead/pvTxDataHd. (c545e6a6) · Commits · 戴 / test

drivers/staging/vt6656/rxtx.c

+3 −39

Original line number	Diff line number	Diff line
		@@ -103,10 +103,6 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice,
		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,
		u32 uDMAIdx, int bNeedAck, u8 byFBOption);

		static void s_vGenerateMACHeader(struct vnt_private *pDevice,
		u8 pbyBufferAddr, u16 wDuration, struct ethhdr psEthHeader,
		int bNeedEncrypt, u16 wFragType, u32 uDMAIdx, u32 uFragIdx);
		@@ -585,32 +581,6 @@ static u16 vnt_rxtx_datahead_ab(struct vnt_private *priv, u8 pkt_type,
		return buf->wDuration;
		}

		static u32 s_uFillDataHead(struct vnt_private *pDevice,
		u8 byPktType, u16 wCurrentRate, void *pTxDataHead, u32 cbFrameLength,
		u32 uDMAIdx, int bNeedAck, u8 byFBOption)
		{

		if (pTxDataHead == NULL) {
		return 0;
		}

		if (byPktType == PK_TYPE_11A) {
		struct vnt_tx_datahead_ab *pBuf =
		(struct vnt_tx_datahead_ab *)pTxDataHead;

		return vnt_rxtx_datahead_ab(pDevice, byPktType, wCurrentRate,
		pBuf, cbFrameLength, bNeedAck);
		}
		else if (byPktType == PK_TYPE_11B) {
		struct vnt_tx_datahead_ab *pBuf =
		(struct vnt_tx_datahead_ab *)pTxDataHead;

		return vnt_rxtx_datahead_ab(pDevice, byPktType, wCurrentRate,
		pBuf, cbFrameLength, bNeedAck);
		}
		return 0;
		}

		static int vnt_fill_ieee80211_rts(struct vnt_private *priv,
		struct ieee80211_rts rts, struct ethhdr eth_hdr,
		u16 duration)
		@@ -1028,14 +998,13 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType,
		u32 uDuration;
		u32 cbHeaderLength = 0, uPadding = 0;
		struct vnt_mic_hdr *pMICHDR;
		void *pvTxDataHd;
		u8 byFBOption = AUTO_FB_NONE, byFragType;
		u16 wTxBufSize;
		u32 dwMICKey0, dwMICKey1, dwMIC_Priority;
		u32 pdwMIC_L, pdwMIC_R;
		int bSoftWEP = false;

		pMICHDR = pvTxDataHd = NULL;
		pMICHDR = NULL;

		if (bNeedEncryption && pTransmitKey->pvKeyTable) {
		if (((PSKeyTable)pTransmitKey->pvKeyTable)->bSoftWEP == true)
		@@ -1799,7 +1768,6 @@ void vDMA0_tx_80211(struct vnt_private pDevice, struct sk_buff skb)
		struct vnt_tx_fifo_head *pTxBufHead;
		u8 byPktType;
		u8 *pbyTxBufferAddr;
		void *pvTxDataHd;
		u32 uDuration, cbReqCount;
		struct ieee80211_hdr *pMACHeader;
		u32 cbHeaderSize, cbFrameBodySize;
		@@ -1825,7 +1793,7 @@ void vDMA0_tx_80211(struct vnt_private pDevice, struct sk_buff skb)
		u32 cbExtSuppRate = 0;
		struct vnt_usb_send_context *pContext;

		pMICHDR = pvTxDataHd = NULL;
		pMICHDR = NULL;

		if(skb->len <= WLAN_HDR_ADDR3_LEN) {
		cbFrameBodySize = 0;
		@@ -2008,10 +1976,6 @@ void vDMA0_tx_80211(struct vnt_private pDevice, struct sk_buff skb)
		pTX_Buffer, &pMICHDR, cbMICHDR,
		cbFrameSize, bNeedACK, TYPE_TXDMA0, &sEthHeader, false);

		//Fill DataHead
		uDuration \|= s_uFillDataHead(pDevice, byPktType, wCurrentRate, pvTxDataHd,
		cbFrameSize, TYPE_TXDMA0, bNeedACK, AUTO_FB_NONE);

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

		cbReqCount = cbHeaderSize + cbMacHdLen + uPadding + cbIVlen + (cbFrameBodySize + cbMIClen) + cbExtSuppRate;

Admin message