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

staging: vt6656: rxtx.c remove typdef PTX_BUFFER

Browse source 
Rename to vnt_tx_buffer.

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-08-15 19:34:37 +01:00 • committed by Greg Kroah-Hartman
parent 83db51fe72
commit f39c0d8e30
2 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -996,8 +996,8 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType,
u32 uNodeIndex, u16 wCurrentRate, u32 *pcbHeaderLen, u32 *pcbTotalLen) u32 uNodeIndex, u16 wCurrentRate, u32 *pcbHeaderLen, u32 *pcbTotalLen)
{ {
struct vnt_manager *pMgmt = &pDevice->vnt_mgmt; struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;
struct vnt_tx_buffer *pTxBufHead;
u32 cbFrameSize, cbFrameBodySize; u32 cbFrameSize, cbFrameBodySize;
PTX_BUFFER pTxBufHead;
u32 cb802_1_H_len; u32 cb802_1_H_len;
u32 cbIVlen = 0, cbICVlen = 0, cbMIClen = 0, cbMACHdLen = 0; u32 cbIVlen = 0, cbICVlen = 0, cbMIClen = 0, cbMACHdLen = 0;
u32 cbFCSlen = 4, cbMICHDR = 0; u32 cbFCSlen = 4, cbMICHDR = 0;
@ -1026,7 +1026,7 @@ static int s_bPacketToWirelessUsb(struct vnt_private *pDevice, u8 byPktType,
bSoftWEP = true; /* WEP 256 */ bSoftWEP = true; /* WEP 256 */
} }
pTxBufHead = (PTX_BUFFER) usbPacketBuf; pTxBufHead = (struct vnt_tx_buffer *)usbPacketBuf;
// Get pkt type // Get pkt type
if (ntohs(psEthHeader->h_proto) > ETH_DATA_LEN) { if (ntohs(psEthHeader->h_proto) > ETH_DATA_LEN) {
@ -1489,7 +1489,7 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice,
struct vnt_tx_mgmt *pPacket) struct vnt_tx_mgmt *pPacket)
{ {
struct vnt_manager *pMgmt = &pDevice->vnt_mgmt; struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;
PTX_BUFFER pTX_Buffer; struct vnt_tx_buffer *pTX_Buffer;
PSTxBufHead pTxBufHead; PSTxBufHead pTxBufHead;
PUSB_SEND_CONTEXT pContext; PUSB_SEND_CONTEXT pContext;
struct ieee80211_hdr *pMACHeader; struct ieee80211_hdr *pMACHeader;
@ -1512,7 +1512,7 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice,
return CMD_STATUS_RESOURCES; return CMD_STATUS_RESOURCES;
} }
pTX_Buffer = (PTX_BUFFER) (&pContext->Data[0]); pTX_Buffer = (struct vnt_tx_buffer *)&pContext->Data[0];
pbyTxBufferAddr = (u8 *)&(pTX_Buffer->adwTxKey[0]); pbyTxBufferAddr = (u8 *)&(pTX_Buffer->adwTxKey[0]);
cbFrameBodySize = pPacket->cbPayloadLen; cbFrameBodySize = pPacket->cbPayloadLen;
pTxBufHead = (PSTxBufHead) pbyTxBufferAddr; pTxBufHead = (PSTxBufHead) pbyTxBufferAddr;
@ -1838,6 +1838,7 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice,
void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb) void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb)
{ {
struct vnt_manager *pMgmt = &pDevice->vnt_mgmt; struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;
struct vnt_tx_buffer *pTX_Buffer;
u8 byPktType; u8 byPktType;
u8 *pbyTxBufferAddr; u8 *pbyTxBufferAddr;
void *pvRTS, *pvCTS, *pvTxDataHd; void *pvRTS, *pvCTS, *pvTxDataHd;
@ -1865,7 +1866,6 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb)
PSKeyItem pTransmitKey = NULL; PSKeyItem pTransmitKey = NULL;
u8 *pbyIVHead, *pbyPayloadHead, *pbyMacHdr; u8 *pbyIVHead, *pbyPayloadHead, *pbyMacHdr;
u32 cbExtSuppRate = 0; u32 cbExtSuppRate = 0;
PTX_BUFFER pTX_Buffer;
PUSB_SEND_CONTEXT pContext; PUSB_SEND_CONTEXT pContext;
pvRrvTime = pMICHDR = pvRTS = pvCTS = pvTxDataHd = NULL; pvRrvTime = pMICHDR = pvRTS = pvCTS = pvTxDataHd = NULL;
@ -1886,7 +1886,7 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb)
return ; return ;
} }
pTX_Buffer = (PTX_BUFFER)(&pContext->Data[0]); pTX_Buffer = (struct vnt_tx_buffer *)&pContext->Data[0];
pbyTxBufferAddr = (u8 *)(&pTX_Buffer->adwTxKey[0]); pbyTxBufferAddr = (u8 *)(&pTX_Buffer->adwTxKey[0]);
pTxBufHead = (PSTxBufHead) pbyTxBufferAddr; pTxBufHead = (PSTxBufHead) pbyTxBufferAddr;
wTxBufSize = sizeof(STxBufHead); wTxBufSize = sizeof(STxBufHead);
@ -2218,6 +2218,7 @@ int nsDMA_tx_packet(struct vnt_private *pDevice,
{ {
struct net_device_stats *pStats = &pDevice->stats; struct net_device_stats *pStats = &pDevice->stats;
struct vnt_manager *pMgmt = &pDevice->vnt_mgmt; struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;
struct vnt_tx_buffer *pTX_Buffer;
u32 BytesToWrite = 0, uHeaderLen = 0; u32 BytesToWrite = 0, uHeaderLen = 0;
u32 uNodeIndex = 0; u32 uNodeIndex = 0;
u8 byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80}; u8 byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80};
@ -2233,7 +2234,6 @@ int nsDMA_tx_packet(struct vnt_private *pDevice,
int bNodeExist = false; int bNodeExist = false;
PUSB_SEND_CONTEXT pContext; PUSB_SEND_CONTEXT pContext;
bool fConvertedPacket; bool fConvertedPacket;
PTX_BUFFER pTX_Buffer;
u32 status; u32 status;
u16 wKeepRate = pDevice->wCurrentRate; u16 wKeepRate = pDevice->wCurrentRate;
int bTxeapol_key = false; int bTxeapol_key = false;
@ -2564,7 +2564,7 @@ int nsDMA_tx_packet(struct vnt_private *pDevice,
} }
} }
pTX_Buffer = (PTX_BUFFER)&(pContext->Data[0]); pTX_Buffer = (struct vnt_tx_buffer *)&pContext->Data[0];
pTX_Buffer->byPKTNO = (u8) (((pDevice->wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F)); pTX_Buffer->byPKTNO = (u8) (((pDevice->wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F));
pTX_Buffer->wTxByteCount = (u16)BytesToWrite; pTX_Buffer->wTxByteCount = (u16)BytesToWrite;
@ -2611,6 +2611,7 @@ int bRelayPacketSend(struct vnt_private *pDevice, u8 *pbySkbData, u32 uDataLen,
u32 uNodeIndex) u32 uNodeIndex)
{ {
struct vnt_manager *pMgmt = &pDevice->vnt_mgmt; struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;
struct vnt_tx_buffer *pTX_Buffer;
u32 BytesToWrite = 0, uHeaderLen = 0; u32 BytesToWrite = 0, uHeaderLen = 0;
u8 byPktType = PK_TYPE_11B; u8 byPktType = PK_TYPE_11B;
int bNeedEncryption = false; int bNeedEncryption = false;
@ -2620,7 +2621,6 @@ int bRelayPacketSend(struct vnt_private *pDevice, u8 *pbySkbData, u32 uDataLen,
PUSB_SEND_CONTEXT pContext; PUSB_SEND_CONTEXT pContext;
u8 byPktTyp; u8 byPktTyp;
int fConvertedPacket; int fConvertedPacket;
PTX_BUFFER pTX_Buffer;
u32 status; u32 status;
u16 wKeepRate = pDevice->wCurrentRate; u16 wKeepRate = pDevice->wCurrentRate;
@ -2714,7 +2714,7 @@ int bRelayPacketSend(struct vnt_private *pDevice, u8 *pbySkbData, u32 uDataLen,
return false; return false;
} }
pTX_Buffer = (PTX_BUFFER)&(pContext->Data[0]); pTX_Buffer = (struct vnt_tx_buffer *)&pContext->Data[0];
pTX_Buffer->byPKTNO = (u8) (((pDevice->wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F)); pTX_Buffer->byPKTNO = (u8) (((pDevice->wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F));
pTX_Buffer->wTxByteCount = (u16)BytesToWrite; pTX_Buffer->wTxByteCount = (u16)BytesToWrite;

20
drivers/staging/vt6656/rxtx.h
View file

@ -32,18 +32,16 @@
#include "device.h" #include "device.h"
#include "wcmd.h" #include "wcmd.h"
typedef struct tagSTX_BUFFER struct vnt_tx_buffer {
{ u8 byType;
u8 byType; u8 byPKTNO;
u8 byPKTNO; u16 wTxByteCount;
u16 wTxByteCount;
u32 adwTxKey[4]; u32 adwTxKey[4];
u16 wFIFOCtl; u16 wFIFOCtl;
u16 wTimeStamp; u16 wTimeStamp;
u16 wFragCtl; u16 wFragCtl;
u16 wReserved; u16 wReserved;
} __packed TX_BUFFER, *PTX_BUFFER; } __packed;
typedef struct tagSBEACON_BUFFER typedef struct tagSBEACON_BUFFER
{ {