diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2013-08-15 18:40:08 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-16 00:20:54 (GMT) |
| commit | 01f865ba4a1ee95d4828b4f3fa69d68f9ac4b9ba (patch) | |
| tree | b5a2091402fe73f794bc717f770a96b9d983e3c8 | |
| parent | d0a2b8fa7663a09b66f54b77dbbf460fb762aa7d (diff) | |
| download | linux-01f865ba4a1ee95d4828b4f3fa69d68f9ac4b9ba.tar.xz | |
staging: vt6656: rxtx.h : remove typedef struct tagSBEACON_BUFFER
Replace with struct vnt_beacon_buffer.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/vt6656/rxtx.c | 5 | ||||
| -rw-r--r-- | drivers/staging/vt6656/rxtx.h | 16 |
2 files changed, 10 insertions, 11 deletions
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index e37e82c..7a4ebbc 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -1753,6 +1753,7 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice, CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice, struct vnt_tx_mgmt *pPacket) { + struct vnt_beacon_buffer *pTX_Buffer; u32 cbFrameSize = pPacket->cbMPDULen + WLAN_FCS_LEN; u32 cbHeaderSize = 0; u16 wTxBufSize = sizeof(STxShortBufHead); @@ -1762,7 +1763,6 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice, u16 wCurrentRate; u32 cbFrameBodySize; u32 cbReqCount; - PBEACON_BUFFER pTX_Buffer; u8 *pbyTxBufferAddr; PUSB_SEND_CONTEXT pContext; 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"); return status ; } - pTX_Buffer = (PBEACON_BUFFER) (&pContext->Data[0]); + + pTX_Buffer = (struct vnt_beacon_buffer *)&pContext->Data[0]; pbyTxBufferAddr = (u8 *)&(pTX_Buffer->wFIFOCtl); cbFrameBodySize = pPacket->cbPayloadLen; diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h index bd1f9e2..3e347a9 100644 --- a/drivers/staging/vt6656/rxtx.h +++ b/drivers/staging/vt6656/rxtx.h @@ -43,15 +43,13 @@ struct vnt_tx_buffer { u16 wReserved; } __packed; -typedef struct tagSBEACON_BUFFER -{ - u8 byType; - u8 byPKTNO; - u16 wTxByteCount; - - u16 wFIFOCtl; - u16 wTimeStamp; -} __packed BEACON_BUFFER, *PBEACON_BUFFER; +struct vnt_beacon_buffer { + u8 byType; + u8 byPKTNO; + u16 wTxByteCount; + u16 wFIFOCtl; + u16 wTimeStamp; +} __packed; void vDMA0_tx_80211(struct vnt_private *, struct sk_buff *skb); int nsDMA_tx_packet(struct vnt_private *, u32 uDMAIdx, struct sk_buff *skb); |