leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: vt6656: rxtx.h : remove typedef struct tagSBEACON_BUFFER

Browse Source 
Replace with struct vnt_beacon_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:40:08 +01:00 committed by Greg Kroah-Hartman
parent d0a2b8fa76
commit 01f865ba4a
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1753,6 +1753,7 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice,
CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice, CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice,
struct vnt_tx_mgmt *pPacket) struct vnt_tx_mgmt *pPacket)
{ {
struct vnt_beacon_buffer *pTX_Buffer;
u32 cbFrameSize = pPacket->cbMPDULen + WLAN_FCS_LEN; u32 cbFrameSize = pPacket->cbMPDULen + WLAN_FCS_LEN;
u32 cbHeaderSize = 0; u32 cbHeaderSize = 0;
u16 wTxBufSize = sizeof(STxShortBufHead); u16 wTxBufSize = sizeof(STxShortBufHead);
@ -1762,7 +1763,6 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice,
u16 wCurrentRate; u16 wCurrentRate;
u32 cbFrameBodySize; u32 cbFrameBodySize;
u32 cbReqCount; u32 cbReqCount;
PBEACON_BUFFER pTX_Buffer;
u8 *pbyTxBufferAddr; u8 *pbyTxBufferAddr;
PUSB_SEND_CONTEXT pContext; PUSB_SEND_CONTEXT pContext;
CMD_STATUS status; CMD_STATUS status;
@ -1773,7 +1773,8 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice,
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ManagementSend TX...NO CONTEXT!\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ManagementSend TX...NO CONTEXT!\n");
return status ; return status ;
} }
pTX_Buffer = (PBEACON_BUFFER) (&pContext->Data[0]);
pTX_Buffer = (struct vnt_beacon_buffer *)&pContext->Data[0];
pbyTxBufferAddr = (u8 *)&(pTX_Buffer->wFIFOCtl); pbyTxBufferAddr = (u8 *)&(pTX_Buffer->wFIFOCtl);
cbFrameBodySize = pPacket->cbPayloadLen; cbFrameBodySize = pPacket->cbPayloadLen;

6
drivers/staging/vt6656/rxtx.h
View File

@ -43,15 +43,13 @@ struct vnt_tx_buffer {
u16 wReserved; u16 wReserved;
} __packed; } __packed;
typedef struct tagSBEACON_BUFFER struct vnt_beacon_buffer {
{
u8 byType; u8 byType;
u8 byPKTNO; u8 byPKTNO;
u16 wTxByteCount; u16 wTxByteCount;
u16 wFIFOCtl; u16 wFIFOCtl;
u16 wTimeStamp; u16 wTimeStamp;
} __packed BEACON_BUFFER, *PBEACON_BUFFER; } __packed;
void vDMA0_tx_80211(struct vnt_private *, struct sk_buff *skb); 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 *, u32 uDMAIdx, struct sk_buff *skb);