Skip to content

L
linux
Commit 30a05b39 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files
Options

staging: vt6656: struct vnt_usb_send_context remove camel case. 

Camel case changes
pDevice -> priv
pPacket -> skb
pUrb -> urb
uBufLen -> buf_len;
bBoolInUse -> in_use
Data -> data
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b674ee14
Show whitespace changes
Inline Side-by-side
Showing with 63 additions and 63 deletions
drivers/staging/vt6656/device.h
View file @ 30a05b39
...@@ -176,13 +176,13 @@ struct vnt_rcb { ...@@ -176,13 +176,13 @@ struct vnt_rcb {
/* used to track bulk out irps */ /* used to track bulk out irps */
struct vnt_usb_send_context { struct vnt_usb_send_context {
void *pDevice; void *priv;
struct sk_buff *pPacket; struct sk_buff *skb;
struct urb *pUrb; struct urb *urb;
unsigned int uBufLen; unsigned int buf_len;
u8 type; u8 type;
bool bBoolInUse; bool in_use;
unsigned char Data[MAX_TOTAL_SIZE_WITH_ALL_HEADERS]; unsigned char data[MAX_TOTAL_SIZE_WITH_ALL_HEADERS];
}; };
/* tx packet info for rxtx */ /* tx packet info for rxtx */
......
drivers/staging/vt6656/main_usb.c
View file @ 30a05b39
...@@ -760,9 +760,9 @@ static void device_free_tx_bufs(struct vnt_private *priv) ...@@ -760,9 +760,9 @@ static void device_free_tx_bufs(struct vnt_private *priv)
for (ii = 0; ii < priv->cbTD; ii++) { for (ii = 0; ii < priv->cbTD; ii++) {
tx_context = priv->apTD[ii]; tx_context = priv->apTD[ii];
/* deallocate URBs */ /* deallocate URBs */
if (tx_context->pUrb) { if (tx_context->urb) {
usb_kill_urb(tx_context->pUrb); usb_kill_urb(tx_context->urb);
usb_free_urb(tx_context->pUrb); usb_free_urb(tx_context->urb);
} }
kfree(tx_context); kfree(tx_context);
...@@ -828,17 +828,17 @@ static bool device_alloc_bufs(struct vnt_private *priv) ...@@ -828,17 +828,17 @@ static bool device_alloc_bufs(struct vnt_private *priv)
} }
priv->apTD[ii] = tx_context; priv->apTD[ii] = tx_context;
tx_context->pDevice = priv; tx_context->priv = priv;
/* allocate URBs */ /* allocate URBs */
tx_context->pUrb = usb_alloc_urb(0, GFP_ATOMIC); tx_context->urb = usb_alloc_urb(0, GFP_ATOMIC);
if (tx_context->pUrb == NULL) { if (!tx_context->urb) {
DBG_PRT(MSG_LEVEL_ERR, DBG_PRT(MSG_LEVEL_ERR,
KERN_ERR "alloc tx urb failed\n"); KERN_ERR "alloc tx urb failed\n");
goto free_tx; goto free_tx;
} }
tx_context->bBoolInUse = false; tx_context->in_use = false;
} }
/* allocate RCB mem */ /* allocate RCB mem */
......
drivers/staging/vt6656/rxtx.c
View file @ 30a05b39
...@@ -149,9 +149,9 @@ static struct vnt_usb_send_context ...@@ -149,9 +149,9 @@ static struct vnt_usb_send_context
return NULL; return NULL;
context = priv->apTD[ii]; context = priv->apTD[ii];
if (context->bBoolInUse == false) { if (context->in_use == false) {
context->bBoolInUse = true; context->in_use = true;
memset(context->Data, 0, memset(context->data, 0,
MAX_TOTAL_SIZE_WITH_ALL_HEADERS); MAX_TOTAL_SIZE_WITH_ALL_HEADERS);
return context; return context;
} }
...@@ -1391,7 +1391,7 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice, ...@@ -1391,7 +1391,7 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice,
return CMD_STATUS_RESOURCES; return CMD_STATUS_RESOURCES;
} }
pTX_Buffer = (struct vnt_tx_buffer *)&pContext->Data[0]; pTX_Buffer = (struct vnt_tx_buffer *)&pContext->data[0];
cbFrameBodySize = pPacket->cbPayloadLen; cbFrameBodySize = pPacket->cbPayloadLen;
pTxBufHead = &pTX_Buffer->fifo_head; pTxBufHead = &pTX_Buffer->fifo_head;
pbyTxBufferAddr = (u8 *)&pTxBufHead->adwTxKey[0]; pbyTxBufferAddr = (u8 *)&pTxBufHead->adwTxKey[0];
...@@ -1609,9 +1609,9 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice, ...@@ -1609,9 +1609,9 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice,
pTX_Buffer->byPKTNO = (u8) (((wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F)); pTX_Buffer->byPKTNO = (u8) (((wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F));
pTX_Buffer->byType = 0x00; pTX_Buffer->byType = 0x00;
pContext->pPacket = NULL; pContext->skb = NULL;
pContext->type = CONTEXT_MGMT_PACKET; pContext->type = CONTEXT_MGMT_PACKET;
pContext->uBufLen = (u16)cbReqCount + 4; //USB header pContext->buf_len = (u16)cbReqCount + 4; /* USB header */
if (WLAN_GET_FC_TODS(pMACHeader->frame_control) == 0) { if (WLAN_GET_FC_TODS(pMACHeader->frame_control) == 0) {
s_vSaveTxPktInfo(pDevice, (u8)(pTX_Buffer->byPKTNO & 0x0F), s_vSaveTxPktInfo(pDevice, (u8)(pTX_Buffer->byPKTNO & 0x0F),
...@@ -1649,7 +1649,7 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice, ...@@ -1649,7 +1649,7 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice,
return status ; return status ;
} }
pTX_Buffer = (struct vnt_beacon_buffer *)&pContext->Data[0]; pTX_Buffer = (struct vnt_beacon_buffer *)&pContext->data[0];
short_head = &pTX_Buffer->short_head; short_head = &pTX_Buffer->short_head;
cbFrameBodySize = pPacket->cbPayloadLen; cbFrameBodySize = pPacket->cbPayloadLen;
...@@ -1701,9 +1701,9 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice, ...@@ -1701,9 +1701,9 @@ CMD_STATUS csBeacon_xmit(struct vnt_private *pDevice,
pTX_Buffer->byPKTNO = (u8) (((wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F)); pTX_Buffer->byPKTNO = (u8) (((wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F));
pTX_Buffer->byType = 0x01; pTX_Buffer->byType = 0x01;
pContext->pPacket = NULL; pContext->skb = NULL;
pContext->type = CONTEXT_MGMT_PACKET; pContext->type = CONTEXT_MGMT_PACKET;
pContext->uBufLen = (u16)cbReqCount + 4; //USB header pContext->buf_len = (u16)cbReqCount + 4; /* USB header */
PIPEnsSendBulkOut(pDevice,pContext); PIPEnsSendBulkOut(pDevice,pContext);
return CMD_STATUS_PENDING; return CMD_STATUS_PENDING;
...@@ -1760,7 +1760,7 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb) ...@@ -1760,7 +1760,7 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb)
return ; return ;
} }
pTX_Buffer = (struct vnt_tx_buffer *)&pContext->Data[0]; pTX_Buffer = (struct vnt_tx_buffer *)&pContext->data[0];
pTxBufHead = &pTX_Buffer->fifo_head; pTxBufHead = &pTX_Buffer->fifo_head;
pbyTxBufferAddr = (u8 *)&pTxBufHead->adwTxKey[0]; pbyTxBufferAddr = (u8 *)&pTxBufHead->adwTxKey[0];
wTxBufSize = sizeof(struct vnt_tx_fifo_head); wTxBufSize = sizeof(struct vnt_tx_fifo_head);
...@@ -2049,9 +2049,9 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb) ...@@ -2049,9 +2049,9 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb)
pTX_Buffer->byPKTNO = (u8) (((wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F)); pTX_Buffer->byPKTNO = (u8) (((wCurrentRate<<4) &0x00F0) | ((pDevice->wSeqCounter - 1) & 0x000F));
pTX_Buffer->byType = 0x00; pTX_Buffer->byType = 0x00;
pContext->pPacket = skb; pContext->skb = skb;
pContext->type = CONTEXT_MGMT_PACKET; pContext->type = CONTEXT_MGMT_PACKET;
pContext->uBufLen = (u16)cbReqCount + 4; //USB header pContext->buf_len = (u16)cbReqCount + 4; /* USB header */
if (WLAN_GET_FC_TODS(pMACHeader->frame_control) == 0) { if (WLAN_GET_FC_TODS(pMACHeader->frame_control) == 0) {
s_vSaveTxPktInfo(pDevice, (u8)(pTX_Buffer->byPKTNO & 0x0F), s_vSaveTxPktInfo(pDevice, (u8)(pTX_Buffer->byPKTNO & 0x0F),
...@@ -2408,7 +2408,7 @@ int nsDMA_tx_packet(struct vnt_private *pDevice, struct sk_buff *skb) ...@@ -2408,7 +2408,7 @@ int nsDMA_tx_packet(struct vnt_private *pDevice, struct sk_buff *skb)
return STATUS_RESOURCES; return STATUS_RESOURCES;
} }
pTX_Buffer = (struct vnt_tx_buffer *)&pContext->Data[0]; pTX_Buffer = (struct vnt_tx_buffer *)&pContext->data[0];
fConvertedPacket = s_bPacketToWirelessUsb(pDevice, byPktType, fConvertedPacket = s_bPacketToWirelessUsb(pDevice, byPktType,
pTX_Buffer, bNeedEncryption, pTX_Buffer, bNeedEncryption,
...@@ -2419,7 +2419,7 @@ int nsDMA_tx_packet(struct vnt_private *pDevice, struct sk_buff *skb) ...@@ -2419,7 +2419,7 @@ int nsDMA_tx_packet(struct vnt_private *pDevice, struct sk_buff *skb)
); );
if (fConvertedPacket == false) { if (fConvertedPacket == false) {
pContext->bBoolInUse = false; pContext->in_use = false;
dev_kfree_skb_irq(skb); dev_kfree_skb_irq(skb);
return STATUS_FAILURE; return STATUS_FAILURE;
} }
...@@ -2436,9 +2436,9 @@ int nsDMA_tx_packet(struct vnt_private *pDevice, struct sk_buff *skb) ...@@ -2436,9 +2436,9 @@ int nsDMA_tx_packet(struct vnt_private *pDevice, struct sk_buff *skb)
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->tx_byte_count = cpu_to_le16((u16)BytesToWrite); pTX_Buffer->tx_byte_count = cpu_to_le16((u16)BytesToWrite);
pContext->pPacket = skb; pContext->skb = skb;
pContext->type = CONTEXT_DATA_PACKET; pContext->type = CONTEXT_DATA_PACKET;
pContext->uBufLen = (u16)BytesToWrite + 4 ; //USB header pContext->buf_len = (u16)BytesToWrite + 4 ; /* USB header */
s_vSaveTxPktInfo(pDevice, (u8)(pTX_Buffer->byPKTNO & 0x0F), s_vSaveTxPktInfo(pDevice, (u8)(pTX_Buffer->byPKTNO & 0x0F),
&pDevice->sTxEthHeader.h_dest[0], &pDevice->sTxEthHeader.h_dest[0],
...@@ -2453,14 +2453,14 @@ int nsDMA_tx_packet(struct vnt_private *pDevice, struct sk_buff *skb) ...@@ -2453,14 +2453,14 @@ int nsDMA_tx_packet(struct vnt_private *pDevice, struct sk_buff *skb)
bScheduleCommand((void *) pDevice, WLAN_CMD_DEAUTH, (u8 *) &wReason); bScheduleCommand((void *) pDevice, WLAN_CMD_DEAUTH, (u8 *) &wReason);
} }
if(status!=STATUS_PENDING) { if (status != STATUS_PENDING) {
pContext->bBoolInUse = false; pContext->in_use = false;
dev_kfree_skb_irq(skb); dev_kfree_skb_irq(skb);
return STATUS_FAILURE; return STATUS_FAILURE;
} }
else
return 0;
return 0;
} }
/* /*
...@@ -2531,7 +2531,7 @@ int bRelayPacketSend(struct vnt_private *pDevice, u8 *pbySkbData, u32 uDataLen, ...@@ -2531,7 +2531,7 @@ int bRelayPacketSend(struct vnt_private *pDevice, u8 *pbySkbData, u32 uDataLen,
} }
if ( bNeedEncryption && (pTransmitKey == NULL) ) { if ( bNeedEncryption && (pTransmitKey == NULL) ) {
pContext->bBoolInUse = false; pContext->in_use = false;
return false; return false;
} }
...@@ -2572,7 +2572,7 @@ int bRelayPacketSend(struct vnt_private *pDevice, u8 *pbySkbData, u32 uDataLen, ...@@ -2572,7 +2572,7 @@ int bRelayPacketSend(struct vnt_private *pDevice, u8 *pbySkbData, u32 uDataLen,
// Convert the packet to an usb frame and copy into our buffer // Convert the packet to an usb frame and copy into our buffer
// and send the irp. // and send the irp.
pTX_Buffer = (struct vnt_tx_buffer *)&pContext->Data[0]; pTX_Buffer = (struct vnt_tx_buffer *)&pContext->data[0];
fConvertedPacket = s_bPacketToWirelessUsb(pDevice, byPktType, fConvertedPacket = s_bPacketToWirelessUsb(pDevice, byPktType,
pTX_Buffer, bNeedEncryption, pTX_Buffer, bNeedEncryption,
...@@ -2583,16 +2583,16 @@ int bRelayPacketSend(struct vnt_private *pDevice, u8 *pbySkbData, u32 uDataLen, ...@@ -2583,16 +2583,16 @@ int bRelayPacketSend(struct vnt_private *pDevice, u8 *pbySkbData, u32 uDataLen,
); );
if (fConvertedPacket == false) { if (fConvertedPacket == false) {
pContext->bBoolInUse = false; pContext->in_use = false;
return false; return false;
} }
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->tx_byte_count = cpu_to_le16((u16)BytesToWrite); pTX_Buffer->tx_byte_count = cpu_to_le16((u16)BytesToWrite);
pContext->pPacket = NULL; pContext->skb = NULL;
pContext->type = CONTEXT_DATA_PACKET; pContext->type = CONTEXT_DATA_PACKET;
pContext->uBufLen = (u16)BytesToWrite + 4 ; //USB header pContext->buf_len = (u16)BytesToWrite + 4; /* USB header */
s_vSaveTxPktInfo(pDevice, (u8)(pTX_Buffer->byPKTNO & 0x0F), s_vSaveTxPktInfo(pDevice, (u8)(pTX_Buffer->byPKTNO & 0x0F),
&pDevice->sTxEthHeader.h_dest[0], &pDevice->sTxEthHeader.h_dest[0],
......
drivers/staging/vt6656/usbpipe.c
View file @ 30a05b39
...@@ -530,17 +530,17 @@ int PIPEnsSendBulkOut(struct vnt_private *priv, ...@@ -530,17 +530,17 @@ int PIPEnsSendBulkOut(struct vnt_private *priv,
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"s_nsSendBulkOut\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"s_nsSendBulkOut\n");
if (!(MP_IS_READY(priv) && priv->Flags & fMP_POST_WRITES)) { if (!(MP_IS_READY(priv) && priv->Flags & fMP_POST_WRITES)) {
context->bBoolInUse = false; context->in_use = false;
return STATUS_RESOURCES; return STATUS_RESOURCES;
} }
urb = context->pUrb; urb = context->urb;
usb_fill_bulk_urb(urb, usb_fill_bulk_urb(urb,
priv->usb, priv->usb,
usb_sndbulkpipe(priv->usb, 3), usb_sndbulkpipe(priv->usb, 3),
context->Data, context->data,
context->uBufLen, context->buf_len,
s_nsBulkOutIoCompleteWrite, s_nsBulkOutIoCompleteWrite,
context); context);
...@@ -548,7 +548,7 @@ int PIPEnsSendBulkOut(struct vnt_private *priv, ...@@ -548,7 +548,7 @@ int PIPEnsSendBulkOut(struct vnt_private *priv,
if (status != 0) { if (status != 0) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
"Submit Tx URB failed %d\n", status); "Submit Tx URB failed %d\n", status);
context->bBoolInUse = false; context->in_use = false;
return STATUS_FAILURE; return STATUS_FAILURE;
} }
...@@ -586,7 +586,7 @@ int PIPEnsSendBulkOut(struct vnt_private *priv, ...@@ -586,7 +586,7 @@ int PIPEnsSendBulkOut(struct vnt_private *priv,
static void s_nsBulkOutIoCompleteWrite(struct urb *urb) static void s_nsBulkOutIoCompleteWrite(struct urb *urb)
{ {
struct vnt_usb_send_context *context = urb->context; struct vnt_usb_send_context *context = urb->context;
struct vnt_private *priv = context->pDevice; struct vnt_private *priv = context->priv;
u8 context_type = context->type; u8 context_type = context->type;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->s_nsBulkOutIoCompleteWrite\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->s_nsBulkOutIoCompleteWrite\n");
...@@ -594,12 +594,12 @@ static void s_nsBulkOutIoCompleteWrite(struct urb *urb) ...@@ -594,12 +594,12 @@ static void s_nsBulkOutIoCompleteWrite(struct urb *urb)
switch (urb->status) { switch (urb->status) {
case 0: case 0:
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
"Write %d bytes\n", context->uBufLen); "Write %d bytes\n", context->buf_len);
break; break;
case -ECONNRESET: case -ECONNRESET:
case -ENOENT: case -ENOENT:
case -ESHUTDOWN: case -ESHUTDOWN:
context->bBoolInUse = false; context->in_use = false;
return; return;
case -ETIMEDOUT: case -ETIMEDOUT:
default: default:
...@@ -612,11 +612,11 @@ static void s_nsBulkOutIoCompleteWrite(struct urb *urb) ...@@ -612,11 +612,11 @@ static void s_nsBulkOutIoCompleteWrite(struct urb *urb)
return; return;
if (CONTEXT_DATA_PACKET == context_type) { if (CONTEXT_DATA_PACKET == context_type) {
if (context->pPacket != NULL) { if (context->skb != NULL) {
dev_kfree_skb_irq(context->pPacket); dev_kfree_skb_irq(context->skb);
context->pPacket = NULL; context->skb = NULL;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
"tx %d bytes\n", context->uBufLen); "tx %d bytes\n", context->buf_len);
} }
priv->dev->trans_start = jiffies; priv->dev->trans_start = jiffies;
...@@ -627,7 +627,7 @@ static void s_nsBulkOutIoCompleteWrite(struct urb *urb) ...@@ -627,7 +627,7 @@ static void s_nsBulkOutIoCompleteWrite(struct urb *urb)
netif_wake_queue(priv->dev); netif_wake_queue(priv->dev);
} }
context->bBoolInUse = false; context->in_use = false;
return; return;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7