UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: vt6656: rxtx.c remove dead code s_uFillDataHead/pvTxDataHd. 

uFillDataHead in is now dead so remove and pvTxDataHd.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2013-10-01 16:07:25 +01:00 committed by Greg Kroah-Hartman
parent c12dca0946
commit c545e6a6f0
1 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/staging/vt6656/rxtx.c
View File

@ -103,10 +103,6 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice,
struct vnt_mic_hdr **mic_hdr, u32 need_mic, u32 cbFrameSize, struct vnt_mic_hdr **mic_hdr, u32 need_mic, u32 cbFrameSize,
int bNeedACK, u32 uDMAIdx, struct ethhdr *psEthHeader, bool need_rts); 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, static void s_vGenerateMACHeader(struct vnt_private *pDevice,
u8 *pbyBufferAddr, u16 wDuration, struct ethhdr *psEthHeader, u8 *pbyBufferAddr, u16 wDuration, struct ethhdr *psEthHeader,
int bNeedEncrypt, u16 wFragType, u32 uDMAIdx, u32 uFragIdx); 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; 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, static int vnt_fill_ieee80211_rts(struct vnt_private *priv,
struct ieee80211_rts *rts, struct ethhdr *eth_hdr, struct ieee80211_rts *rts, struct ethhdr *eth_hdr,
u16 duration) u16 duration)
@ -1028,14 +998,13 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType,
u32 uDuration; u32 uDuration;
u32 cbHeaderLength = 0, uPadding = 0; u32 cbHeaderLength = 0, uPadding = 0;
struct vnt_mic_hdr *pMICHDR; struct vnt_mic_hdr *pMICHDR;
void *pvTxDataHd;
u8 byFBOption = AUTO_FB_NONE, byFragType; u8 byFBOption = AUTO_FB_NONE, byFragType;
u16 wTxBufSize; u16 wTxBufSize;
u32 dwMICKey0, dwMICKey1, dwMIC_Priority; u32 dwMICKey0, dwMICKey1, dwMIC_Priority;
u32 *pdwMIC_L, *pdwMIC_R; u32 *pdwMIC_L, *pdwMIC_R;
int bSoftWEP = false; int bSoftWEP = false;
pMICHDR = pvTxDataHd = NULL; pMICHDR = NULL;
if (bNeedEncryption && pTransmitKey->pvKeyTable) { if (bNeedEncryption && pTransmitKey->pvKeyTable) {
if (((PSKeyTable)pTransmitKey->pvKeyTable)->bSoftWEP == true) 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; struct vnt_tx_fifo_head *pTxBufHead;
u8 byPktType; u8 byPktType;
u8 *pbyTxBufferAddr; u8 *pbyTxBufferAddr;
void *pvTxDataHd;
u32 uDuration, cbReqCount; u32 uDuration, cbReqCount;
struct ieee80211_hdr *pMACHeader; struct ieee80211_hdr *pMACHeader;
u32 cbHeaderSize, cbFrameBodySize; u32 cbHeaderSize, cbFrameBodySize;
@ -1825,7 +1793,7 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb)
u32 cbExtSuppRate = 0; u32 cbExtSuppRate = 0;
struct vnt_usb_send_context *pContext; struct vnt_usb_send_context *pContext;
pMICHDR = pvTxDataHd = NULL; pMICHDR = NULL;
if(skb->len <= WLAN_HDR_ADDR3_LEN) { if(skb->len <= WLAN_HDR_ADDR3_LEN) {
cbFrameBodySize = 0; cbFrameBodySize = 0;
@ -2008,11 +1976,7 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb)
pTX_Buffer, &pMICHDR, cbMICHDR, pTX_Buffer, &pMICHDR, cbMICHDR,
cbFrameSize, bNeedACK, TYPE_TXDMA0, &sEthHeader, false); cbFrameSize, bNeedACK, TYPE_TXDMA0, &sEthHeader, false);
//Fill DataHead pMACHeader = (struct ieee80211_hdr *) (pbyTxBufferAddr + cbHeaderSize);
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; cbReqCount = cbHeaderSize + cbMacHdLen + uPadding + cbIVlen + (cbFrameBodySize + cbMIClen) + cbExtSuppRate;