evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: vt6656: Remove unused variable bLongHeader

Browse source 
Remove dead bLongHeader code.

In s_vFillTxKey use ieee80211_has_a4 to detect long headers for future use.

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-11-25 22:14:16 +00:00 • committed by Greg Kroah-Hartman
parent ac550511ad
commit 078d0cfdef
2 changed files with 4 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/staging/vt6656/device.h
View file

@ -598,7 +598,6 @@ struct vnt_private {
int bCCK; int bCCK;
int bEncryptionEnable; int bEncryptionEnable;
int bLongHeader;
int bShortSlotTime; int bShortSlotTime;
int bProtectMode; int bProtectMode;
int bNonERPPresent; int bNonERPPresent;

24
drivers/staging/vt6656/rxtx.c
View file

@ -278,7 +278,7 @@ static void s_vFillTxKey(struct vnt_private *pDevice,
mic_hdr->tsc_15_0 = cpu_to_be16(pTransmitKey->wTSC15_0); mic_hdr->tsc_15_0 = cpu_to_be16(pTransmitKey->wTSC15_0);
/* MICHDR1 */ /* MICHDR1 */
if (pDevice->bLongHeader) if (ieee80211_has_a4(pMACHeader->frame_control))
mic_hdr->hlen = cpu_to_be16(28); mic_hdr->hlen = cpu_to_be16(28);
else else
mic_hdr->hlen = cpu_to_be16(22); mic_hdr->hlen = cpu_to_be16(22);
@ -292,7 +292,7 @@ static void s_vFillTxKey(struct vnt_private *pDevice,
& 0xc78f); & 0xc78f);
mic_hdr->seq_ctrl = cpu_to_le16(pMACHeader->seq_ctrl & 0xf); mic_hdr->seq_ctrl = cpu_to_le16(pMACHeader->seq_ctrl & 0xf);
if (pDevice->bLongHeader) if (ieee80211_has_a4(pMACHeader->frame_control))
memcpy(mic_hdr->addr4, pMACHeader->addr4, ETH_ALEN); memcpy(mic_hdr->addr4, pMACHeader->addr4, ETH_ALEN);
} }
} }
@ -790,7 +790,6 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice,
{ {
struct vnt_tx_fifo_head *pFifoHead = &tx_buffer->fifo_head; struct vnt_tx_fifo_head *pFifoHead = &tx_buffer->fifo_head;
union vnt_tx_data_head *head = NULL; union vnt_tx_data_head *head = NULL;
u32 cbMACHdLen = WLAN_HDR_ADDR3_LEN; /* 24 */
u16 wFifoCtl; u16 wFifoCtl;
u8 byFBOption = AUTO_FB_NONE; u8 byFBOption = AUTO_FB_NONE;
@ -805,9 +804,6 @@ static u16 s_vGenerateTxParameter(struct vnt_private *pDevice,
if (!pFifoHead) if (!pFifoHead)
return 0; return 0;
if (pDevice->bLongHeader)
cbMACHdLen = WLAN_HDR_ADDR3_LEN + 6;
if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) { if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
if (need_rts) { if (need_rts) {
struct vnt_rrv_time_rts *pBuf = struct vnt_rrv_time_rts *pBuf =
@ -1007,16 +1003,9 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType,
pTxBufHead->wTimeStamp = DEFAULT_MSDU_LIFETIME_RES_64us; pTxBufHead->wTimeStamp = DEFAULT_MSDU_LIFETIME_RES_64us;
//Set FIFOCTL_LHEAD
if (pDevice->bLongHeader)
pTxBufHead->wFIFOCtl |= FIFOCTL_LHEAD;
//Set FRAGCTL_MACHDCNT //Set FRAGCTL_MACHDCNT
if (pDevice->bLongHeader) { cbMACHdLen = WLAN_HDR_ADDR3_LEN;
cbMACHdLen = WLAN_HDR_ADDR3_LEN + 6;
} else {
cbMACHdLen = WLAN_HDR_ADDR3_LEN;
}
pTxBufHead->wFragCtl |= (u16)(cbMACHdLen << 10); pTxBufHead->wFragCtl |= (u16)(cbMACHdLen << 10);
//Set FIFOCTL_GrpAckPolicy //Set FIFOCTL_GrpAckPolicy
@ -1336,11 +1325,6 @@ static void s_vGenerateMACHeader(struct vnt_private *pDevice,
pMACHeader->duration_id = cpu_to_le16(wDuration); pMACHeader->duration_id = cpu_to_le16(wDuration);
if (pDevice->bLongHeader) {
PWLAN_80211HDR_A4 pMACA4Header = (PWLAN_80211HDR_A4) pbyBufferAddr;
pMACHeader->frame_control |= (FC_TODS | FC_FROMDS);
memcpy(pMACA4Header->abyAddr4, pDevice->abyBSSID, WLAN_ADDR_LEN);
}
pMACHeader->seq_ctrl = cpu_to_le16(pDevice->wSeqCounter << 4); pMACHeader->seq_ctrl = cpu_to_le16(pDevice->wSeqCounter << 4);
//Set FragNumber in Sequence Control //Set FragNumber in Sequence Control