提交 1450ba62 编写于 作者: M Malcolm Priestley 提交者: Greg Kroah-Hartman

staging: vt6656: Remove typedef enum _CONTEXT_TYPE

Replace with enum

assign as u8 type.
Signed-off-by: NMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 21aa212c
...@@ -158,10 +158,10 @@ typedef enum __device_msg_level { ...@@ -158,10 +158,10 @@ typedef enum __device_msg_level {
/* /*
* Enum of context types for SendPacket * Enum of context types for SendPacket
*/ */
typedef enum _CONTEXT_TYPE { enum {
CONTEXT_DATA_PACKET = 1, CONTEXT_DATA_PACKET = 1,
CONTEXT_MGMT_PACKET CONTEXT_MGMT_PACKET
} CONTEXT_TYPE; };
/* RCB (Receive Control Block) */ /* RCB (Receive Control Block) */
struct vnt_rcb { struct vnt_rcb {
...@@ -180,7 +180,7 @@ struct vnt_usb_send_context { ...@@ -180,7 +180,7 @@ struct vnt_usb_send_context {
struct sk_buff *pPacket; struct sk_buff *pPacket;
struct urb *pUrb; struct urb *pUrb;
unsigned int uBufLen; unsigned int uBufLen;
CONTEXT_TYPE Type; u8 type;
struct ethhdr sEthHeader; struct ethhdr sEthHeader;
void *Next; void *Next;
bool bBoolInUse; bool bBoolInUse;
......
...@@ -1610,7 +1610,7 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice, ...@@ -1610,7 +1610,7 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice,
pTX_Buffer->byType = 0x00; pTX_Buffer->byType = 0x00;
pContext->pPacket = NULL; pContext->pPacket = NULL;
pContext->Type = CONTEXT_MGMT_PACKET; pContext->type = CONTEXT_MGMT_PACKET;
pContext->uBufLen = (u16)cbReqCount + 4; //USB header pContext->uBufLen = (u16)cbReqCount + 4; //USB header
if (WLAN_GET_FC_TODS(pMACHeader->frame_control) == 0) { if (WLAN_GET_FC_TODS(pMACHeader->frame_control) == 0) {
...@@ -1702,7 +1702,7 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice, ...@@ -1702,7 +1702,7 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice,
pTX_Buffer->byType = 0x01; pTX_Buffer->byType = 0x01;
pContext->pPacket = NULL; pContext->pPacket = NULL;
pContext->Type = CONTEXT_MGMT_PACKET; pContext->type = CONTEXT_MGMT_PACKET;
pContext->uBufLen = (u16)cbReqCount + 4; //USB header pContext->uBufLen = (u16)cbReqCount + 4; //USB header
PIPEnsSendBulkOut(pDevice,pContext); PIPEnsSendBulkOut(pDevice,pContext);
...@@ -2050,7 +2050,7 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb) ...@@ -2050,7 +2050,7 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb)
pTX_Buffer->byType = 0x00; pTX_Buffer->byType = 0x00;
pContext->pPacket = skb; pContext->pPacket = skb;
pContext->Type = CONTEXT_MGMT_PACKET; pContext->type = CONTEXT_MGMT_PACKET;
pContext->uBufLen = (u16)cbReqCount + 4; //USB header pContext->uBufLen = (u16)cbReqCount + 4; //USB header
if (WLAN_GET_FC_TODS(pMACHeader->frame_control) == 0) { if (WLAN_GET_FC_TODS(pMACHeader->frame_control) == 0) {
...@@ -2440,7 +2440,7 @@ int nsDMA_tx_packet(struct vnt_private *pDevice, ...@@ -2440,7 +2440,7 @@ int nsDMA_tx_packet(struct vnt_private *pDevice,
pTX_Buffer->wTxByteCount = (u16)BytesToWrite; pTX_Buffer->wTxByteCount = (u16)BytesToWrite;
pContext->pPacket = skb; pContext->pPacket = skb;
pContext->Type = CONTEXT_DATA_PACKET; pContext->type = CONTEXT_DATA_PACKET;
pContext->uBufLen = (u16)BytesToWrite + 4 ; //USB header pContext->uBufLen = (u16)BytesToWrite + 4 ; //USB header
s_vSaveTxPktInfo(pDevice, (u8)(pTX_Buffer->byPKTNO & 0x0F), s_vSaveTxPktInfo(pDevice, (u8)(pTX_Buffer->byPKTNO & 0x0F),
...@@ -2594,7 +2594,7 @@ int bRelayPacketSend(struct vnt_private *pDevice, u8 *pbySkbData, u32 uDataLen, ...@@ -2594,7 +2594,7 @@ int bRelayPacketSend(struct vnt_private *pDevice, u8 *pbySkbData, u32 uDataLen,
pTX_Buffer->wTxByteCount = (u16)BytesToWrite; pTX_Buffer->wTxByteCount = (u16)BytesToWrite;
pContext->pPacket = NULL; pContext->pPacket = NULL;
pContext->Type = CONTEXT_DATA_PACKET; pContext->type = CONTEXT_DATA_PACKET;
pContext->uBufLen = (u16)BytesToWrite + 4 ; //USB header pContext->uBufLen = (u16)BytesToWrite + 4 ; //USB header
s_vSaveTxPktInfo(pDevice, (u8)(pTX_Buffer->byPKTNO & 0x0F), s_vSaveTxPktInfo(pDevice, (u8)(pTX_Buffer->byPKTNO & 0x0F),
......
...@@ -610,7 +610,7 @@ static void s_nsBulkOutIoCompleteWrite(struct urb *urb) ...@@ -610,7 +610,7 @@ static void s_nsBulkOutIoCompleteWrite(struct urb *urb)
struct vnt_usb_send_context *context = struct vnt_usb_send_context *context =
(struct vnt_usb_send_context *)urb->context; (struct vnt_usb_send_context *)urb->context;
struct vnt_private *priv = context->pDevice; struct vnt_private *priv = context->pDevice;
CONTEXT_TYPE context_type = context->Type; u8 context_type = context->type;
unsigned long buf_len = context->uBufLen; unsigned long buf_len = context->uBufLen;
int status; int status;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册