staging: hv: Convert camel cased variables in netvsc.c to lower cases
Subsystems (2)
PATCH 1/7 staging: hv: Convert camel cased variables in netvsc.c to lower cases
--- drivers/staging/hv/netvsc.c | 852 ++++++++++++++++++++++--------------------- 1 files changed, 445 insertions(+), 407 deletions(-)
drivers/staging/hv/netvsc.c +445 -407
@@ -31,141 +31,141 @@/* Globals */ -static const char *gDriverName ="netvsc" ; +static const char *driver_name ="netvsc" ;/* {F8615163-DF3E-46c5-913F-F2D2F965ED0E} */ -static const struct hv_guid gNetVscDeviceType = { +static const struct hv_guid netvsc_device_type = { .data = {0x63 ,0x51 ,0x61 ,0xF8 ,0x3E ,0xDF ,0xc5 ,0x46 ,0x91 ,0x3F ,0xF2 ,0xD2 ,0xF9 ,0x65 ,0xED ,0x0E } }; -static int NetVscOnDeviceAdd (struct hv_device *Device,void *AdditionalInfo); +static int NetVscOnDeviceAdd (struct hv_device *device,void *additional_info); -static int NetVscOnDeviceRemove (struct hv_device *Device); +static int NetVscOnDeviceRemove (struct hv_device *device); -static void NetVscOnCleanup (struct hv_driver *Driver); +static void NetVscOnCleanup (struct hv_driver *driver);static void NetVscOnChannelCallback (void *context); -static int NetVscInitializeSendBufferWithNetVsp (struct hv_device *Device); +static int NetVscInitializeSendBufferWithNetVsp (struct hv_device *device); -static int NetVscInitializeReceiveBufferWithNetVsp (struct hv_device *Device); +static int NetVscInitializeReceiveBufferWithNetVsp (struct hv_device *device); -static int NetVscDestroySendBuffer (struct netvsc_device *NetDevice); +static int NetVscDestroySendBuffer (struct netvsc_device *net_device); -static int NetVscDestroyReceiveBuffer (struct netvsc_device *NetDevice); +static int NetVscDestroyReceiveBuffer (struct netvsc_device *net_device); -static int NetVscConnectToVsp (struct hv_device *Device); +static int NetVscConnectToVsp (struct hv_device *device); -static void NetVscOnSendCompletion (struct hv_device *Device, -struct vmpacket_descriptor *Packet); +static void NetVscOnSendCompletion (struct hv_device *device, +struct vmpacket_descriptor *packet); -static int NetVscOnSend (struct hv_device *Device, -struct hv_netvsc_packet *Packet); +static int NetVscOnSend (struct hv_device *device, +struct hv_netvsc_packet *packet); -static void NetVscOnReceive (struct hv_device *Device, -struct vmpacket_descriptor *Packet); +static void NetVscOnReceive (struct hv_device *device, +struct vmpacket_descriptor *packet); -static void NetVscOnReceiveCompletion (void *Context); +static void NetVscOnReceiveCompletion (void *context); -static void NetVscSendReceiveCompletion (struct hv_device *Device, -u64 TransactionId); +static void NetVscSendReceiveCompletion (struct hv_device *device, +u64 transaction_id); -static struct netvsc_device *AllocNetDevice (struct hv_device *Device) +static struct netvsc_device *AllocNetDevice (struct hv_device *device) { -struct netvsc_device *netDevice; +struct netvsc_device *net_device; - netDevice =kzalloc (sizeof (struct netvsc_device ),GFP_KERNEL ); -if (!netDevice) + net_device =kzalloc (sizeof (struct netvsc_device ),GFP_KERNEL ); +if (!net_device)return NULL ;/* Set to 2 to allow both inbound and outbound traffic */ -atomic_cmpxchg (&netDevice->RefCount,0 ,2 ); +atomic_cmpxchg (&net_device->RefCount,0 ,2 ); - netDevice->Device = Device; - Device->Extension = netDevice; + net_device->Device = device; + device->Extension = net_device; -return netDevice; +return net_device; } -static void FreeNetDevice (struct netvsc_device *Device) +static void FreeNetDevice (struct netvsc_device *device) { -WARN_ON (atomic_read (&Device->RefCount) ==0 ); - Device->Device->Extension =NULL ; -kfree (Device); +WARN_ON (atomic_read (&device->RefCount) ==0 ); + device->Device->Extension =NULL ; +kfree (device); }/* Get the net device object iff exists and its refcount > 1 */ -static struct netvsc_device *GetOutboundNetDevice (struct hv_device *Device) +static struct netvsc_device *GetOutboundNetDevice (struct hv_device *device) { -struct netvsc_device *netDevice; +struct netvsc_device *net_device; - netDevice = Device->Extension; -if (netDevice &&atomic_read (&netDevice->RefCount) >1 ) -atomic_inc (&netDevice->RefCount); + net_device = device->Extension; +if (net_device &&atomic_read (&net_device->RefCount) >1 ) +atomic_inc (&net_device->RefCount);else - netDevice =NULL ; + net_device =NULL ; -return netDevice; +return net_device; }/* Get the net device object iff exists and its refcount > 0 */ -static struct netvsc_device *GetInboundNetDevice (struct hv_device *Device) +static struct netvsc_device *GetInboundNetDevice (struct hv_device *device) { -struct netvsc_device *netDevice; +struct netvsc_device *net_device; - netDevice = Device->Extension; -if (netDevice &&atomic_read (&netDevice->RefCount)) -atomic_inc (&netDevice->RefCount); + net_device = device->Extension; +if (net_device &&atomic_read (&net_device->RefCount)) +atomic_inc (&net_device->RefCount);else - netDevice =NULL ; + net_device =NULL ; -return netDevice; +return net_device; } -static void PutNetDevice (struct hv_device *Device) +static void PutNetDevice (struct hv_device *device) { -struct netvsc_device *netDevice; +struct netvsc_device *net_device; - netDevice = Device->Extension; + net_device = device->Extension;/* ASSERT(netDevice); */ -atomic_dec (&netDevice->RefCount); +atomic_dec (&net_device->RefCount); } -static struct netvsc_device *ReleaseOutboundNetDevice (struct hv_device *Device) +static struct netvsc_device *ReleaseOutboundNetDevice (struct hv_device *device) { -struct netvsc_device *netDevice; +struct netvsc_device *net_device; - netDevice = Device->Extension; -if (netDevice ==NULL ) + net_device = device->Extension; +if (net_device ==NULL )return NULL ;/* Busy wait until the ref drop to 2, then set it to 1 */ -while (atomic_cmpxchg (&netDevice->RefCount,2 ,1 ) !=2 ) +while (atomic_cmpxchg (&net_device->RefCount,2 ,1 ) !=2 )udelay (100 ); -return netDevice; +return net_device; } -static struct netvsc_device *ReleaseInboundNetDevice (struct hv_device *Device) +static struct netvsc_device *ReleaseInboundNetDevice (struct hv_device *device) { -struct netvsc_device *netDevice; +struct netvsc_device *net_device; - netDevice = Device->Extension; -if (netDevice ==NULL ) + net_device = device->Extension; +if (net_device ==NULL )return NULL ;/* Busy wait until the ref drop to 1, then set it to 0 */ -while (atomic_cmpxchg (&netDevice->RefCount,1 ,0 ) !=1 ) +while (atomic_cmpxchg (&net_device->RefCount,1 ,0 ) !=1 )udelay (100 ); - Device->Extension =NULL ; -return netDevice; + device->Extension =NULL ; +return net_device; }/*
@@ -185,8 +185,8 @@ int NetVscInitialize(struct hv_driver *drv)/* Make sure we are at least 2 pages since 1 page is used for control */ /* ASSERT(driver->RingBufferSize >= (PAGE_SIZE << 1)); */ - drv->name = gDriverName; -memcpy (&drv->deviceType, &gNetVscDeviceType,sizeof (struct hv_guid )); + drv->name = driver_name; +memcpy (&drv->deviceType, &netvsc_device_type,sizeof (struct hv_guid ));/* Make sure it is set by the caller */ /* FIXME: These probably should still be tested in some way */
@@ -204,14 +204,14 @@ int NetVscInitialize(struct hv_driver *drv)return 0 ; } -static int NetVscInitializeReceiveBufferWithNetVsp (struct hv_device *Device) +static int NetVscInitializeReceiveBufferWithNetVsp (struct hv_device *device) {int ret =0 ; -struct netvsc_device *netDevice; -struct nvsp_message *initPacket; +struct netvsc_device *net_device; +struct nvsp_message *init_packet; - netDevice =GetOutboundNetDevice (Device); -if (!netDevice) { + net_device =GetOutboundNetDevice (device); +if (!net_device) {DPRINT_ERR (NETVSC ,"unable to get net device..." "device being destroyed?" );return -1 ;
@@ -220,12 +220,12 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device)/* page-size grandularity */ /* ASSERT((netDevice->ReceiveBufferSize & (PAGE_SIZE - 1)) == 0); */ - netDevice->ReceiveBuffer = -osd_page_alloc (netDevice->ReceiveBufferSize >>PAGE_SHIFT ); -if (!netDevice->ReceiveBuffer) { + net_device->ReceiveBuffer = +osd_page_alloc (net_device->ReceiveBufferSize >>PAGE_SHIFT ); +if (!net_device->ReceiveBuffer) {DPRINT_ERR (NETVSC ,"unable to allocate receive buffer of size %d" , - netDevice->ReceiveBufferSize); + net_device->ReceiveBufferSize); ret =-1 ; goto Cleanup; }
@@ -240,9 +240,9 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device)* channel. Note: This call uses the vmbus connection rather * than the channel to establish the gpadl handle. */ - ret =vmbus_establish_gpadl (Device->channel, netDevice->ReceiveBuffer, - netDevice->ReceiveBufferSize, - &netDevice->ReceiveBufferGpadlHandle); + ret =vmbus_establish_gpadl (device->channel, net_device->ReceiveBuffer, + net_device->ReceiveBufferSize, + &net_device->ReceiveBufferGpadlHandle);if (ret !=0 ) {DPRINT_ERR (NETVSC ,"unable to establish receive buffer's gpadl" );
@@ -254,18 +254,20 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device)/* Notify the NetVsp of the gpadl handle */ DPRINT_INFO (NETVSC ,"Sending NvspMessage1TypeSendReceiveBuffer..." ); - initPacket = &netDevice->ChannelInitPacket; + init_packet = &net_device->ChannelInitPacket; -memset (initPacket,0 ,sizeof (struct nvsp_message )); +memset (init_packet,0 ,sizeof (struct nvsp_message )); - initPacket->Header.MessageType = NvspMessage1TypeSendReceiveBuffer; - initPacket->Messages.Version1Messages.SendReceiveBuffer.GpadlHandle = netDevice->ReceiveBufferGpadlHandle; - initPacket->Messages.Version1Messages.SendReceiveBuffer.Id =NETVSC_RECEIVE_BUFFER_ID ; + init_packet->Header.MessageType = NvspMessage1TypeSendReceiveBuffer; + init_packet->Messages.Version1Messages.SendReceiveBuffer. + GpadlHandle = net_device->ReceiveBufferGpadlHandle; + init_packet->Messages.Version1Messages. + SendReceiveBuffer.Id =NETVSC_RECEIVE_BUFFER_ID ;/* Send the gpadl notification request */ - ret =vmbus_sendpacket (Device->channel, initPacket, + ret =vmbus_sendpacket (device->channel, init_packet,sizeof (struct nvsp_message ), - (unsigned long )initPacket, + (unsigned long )init_packet, VmbusPacketTypeDataInBand,VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED );if (ret !=0 ) {
@@ -274,13 +276,15 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device) goto Cleanup; } -osd_waitevent_wait (netDevice->ChannelInitEvent); +osd_waitevent_wait (net_device->ChannelInitEvent);/* Check the response */ -if (initPacket->Messages.Version1Messages.SendReceiveBufferComplete.Status != NvspStatusSuccess) { +if (init_packet->Messages.Version1Messages. + SendReceiveBufferComplete.Status != NvspStatusSuccess) {DPRINT_ERR (NETVSC ,"Unable to complete receive buffer " "initialzation with NetVsp - status %d" , - initPacket->Messages.Version1Messages.SendReceiveBufferComplete.Status); + init_packet->Messages.Version1Messages. + SendReceiveBufferComplete.Status); ret =-1 ; goto Cleanup; }
@@ -289,32 +293,36 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device)/* ASSERT(netDevice->ReceiveSectionCount == 0); */ /* ASSERT(netDevice->ReceiveSections == NULL); */ - netDevice->ReceiveSectionCount = initPacket->Messages.Version1Messages.SendReceiveBufferComplete.NumSections; + net_device->ReceiveSectionCount = init_packet->Messages. + Version1Messages.SendReceiveBufferComplete.NumSections; - netDevice->ReceiveSections =kmalloc (netDevice->ReceiveSectionCount *sizeof (struct nvsp_1_receive_buffer_section ),GFP_KERNEL ); -if (netDevice->ReceiveSections ==NULL ) { + net_device->ReceiveSections =kmalloc (net_device->ReceiveSectionCount + *sizeof (struct nvsp_1_receive_buffer_section ),GFP_KERNEL ); +if (net_device->ReceiveSections ==NULL ) { ret =-1 ; goto Cleanup; } -memcpy (netDevice->ReceiveSections, - initPacket->Messages.Version1Messages.SendReceiveBufferComplete.Sections, - netDevice->ReceiveSectionCount *sizeof (struct nvsp_1_receive_buffer_section )); +memcpy (net_device->ReceiveSections, + init_packet->Messages.Version1Messages. + SendReceiveBufferComplete.Sections, + net_device->ReceiveSectionCount * +sizeof (struct nvsp_1_receive_buffer_section ));DPRINT_INFO (NETVSC ,"Receive sections info (count %d, offset %d, " "endoffset %d, suballoc size %d, num suballocs %d)" , - netDevice->ReceiveSectionCount, - netDevice->ReceiveSections[0 ].Offset, - netDevice->ReceiveSections[0 ].EndOffset, - netDevice->ReceiveSections[0 ].SubAllocationSize, - netDevice->ReceiveSections[0 ].NumSubAllocations); + net_device->ReceiveSectionCount, + net_device->ReceiveSections[0 ].Offset, + net_device->ReceiveSections[0 ].EndOffset, + net_device->ReceiveSections[0 ].SubAllocationSize, + net_device->ReceiveSections[0 ].NumSubAllocations);/* * For 1st release, there should only be 1 section that represents the * entire receive buffer */ -if (netDevice->ReceiveSectionCount !=1 || - netDevice->ReceiveSections->Offset !=0 ) { +if (net_device->ReceiveSectionCount !=1 || + net_device->ReceiveSections->Offset !=0 ) { ret =-1 ; goto Cleanup; }
@@ -322,26 +330,26 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *Device) goto Exit; Cleanup: -NetVscDestroyReceiveBuffer (netDevice); +NetVscDestroyReceiveBuffer (net_device); Exit: -PutNetDevice (Device); +PutNetDevice (device);return ret; } -static int NetVscInitializeSendBufferWithNetVsp (struct hv_device *Device) +static int NetVscInitializeSendBufferWithNetVsp (struct hv_device *device) {int ret =0 ; -struct netvsc_device *netDevice; -struct nvsp_message *initPacket; +struct netvsc_device *net_device; +struct nvsp_message *init_packet; - netDevice =GetOutboundNetDevice (Device); -if (!netDevice) { + net_device =GetOutboundNetDevice (device); +if (!net_device) {DPRINT_ERR (NETVSC ,"unable to get net device..." "device being destroyed?" );return -1 ; } -if (netDevice->SendBufferSize <=0 ) { +if (net_device->SendBufferSize <=0 ) { ret = -EINVAL ; goto Cleanup; }
@@ -349,11 +357,11 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device)/* page-size grandularity */ /* ASSERT((netDevice->SendBufferSize & (PAGE_SIZE - 1)) == 0); */ - netDevice->SendBuffer = -osd_page_alloc (netDevice->SendBufferSize >>PAGE_SHIFT ); -if (!netDevice->SendBuffer) { + net_device->SendBuffer = +osd_page_alloc (net_device->SendBufferSize >>PAGE_SHIFT ); +if (!net_device->SendBuffer) {DPRINT_ERR (NETVSC ,"unable to allocate send buffer of size %d" , - netDevice->SendBufferSize); + net_device->SendBufferSize); ret =-1 ; goto Cleanup; }
@@ -367,9 +375,9 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device)* channel. Note: This call uses the vmbus connection rather * than the channel to establish the gpadl handle. */ - ret =vmbus_establish_gpadl (Device->channel, netDevice->SendBuffer, - netDevice->SendBufferSize, - &netDevice->SendBufferGpadlHandle); + ret =vmbus_establish_gpadl (device->channel, net_device->SendBuffer, + net_device->SendBufferSize, + &net_device->SendBufferGpadlHandle);if (ret !=0 ) {DPRINT_ERR (NETVSC ,"unable to establish send buffer's gpadl" ); goto Cleanup;
@@ -380,18 +388,20 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device)/* Notify the NetVsp of the gpadl handle */ DPRINT_INFO (NETVSC ,"Sending NvspMessage1TypeSendSendBuffer..." ); - initPacket = &netDevice->ChannelInitPacket; + init_packet = &net_device->ChannelInitPacket; -memset (initPacket,0 ,sizeof (struct nvsp_message )); +memset (init_packet,0 ,sizeof (struct nvsp_message )); - initPacket->Header.MessageType = NvspMessage1TypeSendSendBuffer; - initPacket->Messages.Version1Messages.SendReceiveBuffer.GpadlHandle = netDevice->SendBufferGpadlHandle; - initPacket->Messages.Version1Messages.SendReceiveBuffer.Id =NETVSC_SEND_BUFFER_ID ; + init_packet->Header.MessageType = NvspMessage1TypeSendSendBuffer; + init_packet->Messages.Version1Messages.SendReceiveBuffer. + GpadlHandle = net_device->SendBufferGpadlHandle; + init_packet->Messages.Version1Messages.SendReceiveBuffer.Id = +NETVSC_SEND_BUFFER_ID ;/* Send the gpadl notification request */ - ret =vmbus_sendpacket (Device->channel, initPacket, + ret =vmbus_sendpacket (device->channel, init_packet,sizeof (struct nvsp_message ), - (unsigned long )initPacket, + (unsigned long )init_packet, VmbusPacketTypeDataInBand,VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED );if (ret !=0 ) {
@@ -400,32 +410,35 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *Device) goto Cleanup; } -osd_waitevent_wait (netDevice->ChannelInitEvent); +osd_waitevent_wait (net_device->ChannelInitEvent);/* Check the response */ -if (initPacket->Messages.Version1Messages.SendSendBufferComplete.Status != NvspStatusSuccess) { +if (init_packet->Messages.Version1Messages. + SendSendBufferComplete.Status != NvspStatusSuccess) {DPRINT_ERR (NETVSC ,"Unable to complete send buffer " "initialzation with NetVsp - status %d" , - initPacket->Messages.Version1Messages.SendSendBufferComplete.Status); + init_packet->Messages.Version1Messages. + SendSendBufferComplete.Status); ret =-1 ; goto Cleanup; } - netDevice->SendSectionSize = initPacket->Messages.Version1Messages.SendSendBufferComplete.SectionSize; + net_device->SendSectionSize = init_packet-> + Messages.Version1Messages.SendSendBufferComplete.SectionSize; goto Exit; Cleanup: -NetVscDestroySendBuffer (netDevice); +NetVscDestroySendBuffer (net_device); Exit: -PutNetDevice (Device); +PutNetDevice (device);return ret; } -static int NetVscDestroyReceiveBuffer (struct netvsc_device *NetDevice) +static int NetVscDestroyReceiveBuffer (struct netvsc_device *net_device) { -struct nvsp_message *revokePacket; +struct nvsp_message *revoke_packet;int ret =0 ;/*
@@ -434,20 +447,23 @@ static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice)* NvspMessage1TypeSendReceiveBuffer msg) therefore, we need * to send a revoke msg here */ -if (NetDevice->ReceiveSectionCount) { +if (net_device->ReceiveSectionCount) {DPRINT_INFO (NETVSC ,"Sending NvspMessage1TypeRevokeReceiveBuffer..." );/* Send the revoke receive buffer */ - revokePacket = &NetDevice->RevokePacket; -memset (revokePacket,0 ,sizeof (struct nvsp_message )); + revoke_packet = &net_device->RevokePacket; +memset (revoke_packet,0 ,sizeof (struct nvsp_message )); - revokePacket->Header.MessageType = NvspMessage1TypeRevokeReceiveBuffer; - revokePacket->Messages.Version1Messages.RevokeReceiveBuffer.Id =NETVSC_RECEIVE_BUFFER_ID ; + revoke_packet->Header.MessageType = + NvspMessage1TypeRevokeReceiveBuffer; + revoke_packet->Messages.Version1Messages. + RevokeReceiveBuffer.Id =NETVSC_RECEIVE_BUFFER_ID ; - ret =vmbus_sendpacket (NetDevice->Device->channel, revokePacket, + ret =vmbus_sendpacket (net_device->Device->channel, + revoke_packet,sizeof (struct nvsp_message ), - (unsigned long )revokePacket, + (unsigned long )revoke_packet, VmbusPacketTypeDataInBand,0 );/* * If we failed here, we might as well return and
@@ -461,11 +477,11 @@ static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice) }/* Teardown the gpadl on the vsp end */ -if (NetDevice->ReceiveBufferGpadlHandle) { +if (net_device->ReceiveBufferGpadlHandle) {DPRINT_INFO (NETVSC ,"Tearing down receive buffer's GPADL..." ); - ret =vmbus_teardown_gpadl (NetDevice->Device->channel, - NetDevice->ReceiveBufferGpadlHandle); + ret =vmbus_teardown_gpadl (net_device->Device->channel, + net_device->ReceiveBufferGpadlHandle);/* If we failed here, we might as well return and have a leak rather than continue and a bugchk */ if (ret !=0 ) {
@@ -473,30 +489,30 @@ static int NetVscDestroyReceiveBuffer(struct netvsc_device *NetDevice) "unable to teardown receive buffer's gpadl");return -1 ; } - NetDevice->ReceiveBufferGpadlHandle =0 ; + net_device->ReceiveBufferGpadlHandle =0 ; } -if (NetDevice->ReceiveBuffer) { +if (net_device->ReceiveBuffer) {DPRINT_INFO (NETVSC ,"Freeing up receive buffer..." );/* Free up the receive buffer */ -osd_page_free (NetDevice->ReceiveBuffer, - NetDevice->ReceiveBufferSize >>PAGE_SHIFT ); - NetDevice->ReceiveBuffer =NULL ; +osd_page_free (net_device->ReceiveBuffer, + net_device->ReceiveBufferSize >>PAGE_SHIFT ); + net_device->ReceiveBuffer =NULL ; } -if (NetDevice->ReceiveSections) { - NetDevice->ReceiveSectionCount =0 ; -kfree (NetDevice->ReceiveSections); - NetDevice->ReceiveSections =NULL ; +if (net_device->ReceiveSections) { + net_device->ReceiveSectionCount =0 ; +kfree (net_device->ReceiveSections); + net_device->ReceiveSections =NULL ; }return ret; } -static int NetVscDestroySendBuffer (struct netvsc_device *NetDevice) +static int NetVscDestroySendBuffer (struct netvsc_device *net_device) { -struct nvsp_message *revokePacket; +struct nvsp_message *revoke_packet;int ret =0 ;/*
@@ -505,20 +521,23 @@ static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice)* NvspMessage1TypeSendReceiveBuffer msg) therefore, we need * to send a revoke msg here */ -if (NetDevice->SendSectionSize) { +if (net_device->SendSectionSize) {DPRINT_INFO (NETVSC ,"Sending NvspMessage1TypeRevokeSendBuffer..." );/* Send the revoke send buffer */ - revokePacket = &NetDevice->RevokePacket; -memset (revokePacket,0 ,sizeof (struct nvsp_message )); + revoke_packet = &net_device->RevokePacket; +memset (revoke_packet,0 ,sizeof (struct nvsp_message )); - revokePacket->Header.MessageType = NvspMessage1TypeRevokeSendBuffer; - revokePacket->Messages.Version1Messages.RevokeSendBuffer.Id =NETVSC_SEND_BUFFER_ID ; + revoke_packet->Header.MessageType = + NvspMessage1TypeRevokeSendBuffer; + revoke_packet->Messages.Version1Messages. + RevokeSendBuffer.Id =NETVSC_SEND_BUFFER_ID ; - ret =vmbus_sendpacket (NetDevice->Device->channel, revokePacket, + ret =vmbus_sendpacket (net_device->Device->channel, + revoke_packet,sizeof (struct nvsp_message ), - (unsigned long )revokePacket, + (unsigned long )revoke_packet, VmbusPacketTypeDataInBand,0 );/* * If we failed here, we might as well return and have a leak
@@ -532,10 +551,10 @@ static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice) }/* Teardown the gpadl on the vsp end */ -if (NetDevice->SendBufferGpadlHandle) { +if (net_device->SendBufferGpadlHandle) {DPRINT_INFO (NETVSC ,"Tearing down send buffer's GPADL..." ); - ret =vmbus_teardown_gpadl (NetDevice->Device->channel, - NetDevice->SendBufferGpadlHandle); + ret =vmbus_teardown_gpadl (net_device->Device->channel, + net_device->SendBufferGpadlHandle);/* * If we failed here, we might as well return and have a leak
@@ -546,49 +565,51 @@ static int NetVscDestroySendBuffer(struct netvsc_device *NetDevice) "gpadl");return -1 ; } - NetDevice->SendBufferGpadlHandle =0 ; + net_device->SendBufferGpadlHandle =0 ; } -if (NetDevice->SendBuffer) { +if (net_device->SendBuffer) {DPRINT_INFO (NETVSC ,"Freeing up send buffer..." );/* Free up the receive buffer */ -osd_page_free (NetDevice->SendBuffer, - NetDevice->SendBufferSize >>PAGE_SHIFT ); - NetDevice->SendBuffer =NULL ; +osd_page_free (net_device->SendBuffer, + net_device->SendBufferSize >>PAGE_SHIFT ); + net_device->SendBuffer =NULL ; }return ret; } -static int NetVscConnectToVsp (struct hv_device *Device) +static int NetVscConnectToVsp (struct hv_device *device) {int ret; -struct netvsc_device *netDevice; -struct nvsp_message *initPacket; -int ndisVersion; +struct netvsc_device *net_device; +struct nvsp_message *init_packet; +int ndis_version; - netDevice =GetOutboundNetDevice (Device); -if (!netDevice) { + net_device =GetOutboundNetDevice (device); +if (!net_device) {DPRINT_ERR (NETVSC ,"unable to get net device..." "device being destroyed?" );return -1 ; } - initPacket = &netDevice->ChannelInitPacket; + init_packet = &net_device->ChannelInitPacket; -memset (initPacket,0 ,sizeof (struct nvsp_message )); - initPacket->Header.MessageType = NvspMessageTypeInit; - initPacket->Messages.InitMessages.Init.MinProtocolVersion =NVSP_MIN_PROTOCOL_VERSION ; - initPacket->Messages.InitMessages.Init.MaxProtocolVersion =NVSP_MAX_PROTOCOL_VERSION ; +memset (init_packet,0 ,sizeof (struct nvsp_message )); + init_packet->Header.MessageType = NvspMessageTypeInit; + init_packet->Messages.InitMessages.Init.MinProtocolVersion = +NVSP_MIN_PROTOCOL_VERSION ; + init_packet->Messages.InitMessages.Init.MaxProtocolVersion = +NVSP_MAX_PROTOCOL_VERSION ;DPRINT_INFO (NETVSC ,"Sending NvspMessageTypeInit..." );/* Send the init request */ - ret =vmbus_sendpacket (Device->channel, initPacket, + ret =vmbus_sendpacket (device->channel, init_packet,sizeof (struct nvsp_message ), - (unsigned long )initPacket, + (unsigned long )init_packet, VmbusPacketTypeDataInBand,VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED );
@@ -597,47 +618,52 @@ static int NetVscConnectToVsp(struct hv_device *Device) goto Cleanup; } -osd_waitevent_wait (netDevice->ChannelInitEvent); +osd_waitevent_wait (net_device->ChannelInitEvent);/* Now, check the response */ /* ASSERT(initPacket->Messages.InitMessages.InitComplete.MaximumMdlChainLength <= MAX_MULTIPAGE_BUFFER_COUNT); */ DPRINT_INFO (NETVSC ,"NvspMessageTypeInit status(%d) max mdl chain (%d)" , - initPacket->Messages.InitMessages.InitComplete.Status, - initPacket->Messages.InitMessages.InitComplete.MaximumMdlChainLength); + init_packet->Messages.InitMessages.InitComplete.Status, + init_packet->Messages.InitMessages. + InitComplete.MaximumMdlChainLength); -if (initPacket->Messages.InitMessages.InitComplete.Status != +if (init_packet->Messages.InitMessages.InitComplete.Status != NvspStatusSuccess) {DPRINT_ERR (NETVSC ,"unable to initialize with netvsp (status 0x%x)" , - initPacket->Messages.InitMessages.InitComplete.Status); + init_packet->Messages.InitMessages.InitComplete.Status); ret =-1 ; goto Cleanup; } -if (initPacket->Messages.InitMessages.InitComplete.NegotiatedProtocolVersion !=NVSP_PROTOCOL_VERSION_1 ) { +if (init_packet->Messages.InitMessages.InitComplete. + NegotiatedProtocolVersion !=NVSP_PROTOCOL_VERSION_1 ) {DPRINT_ERR (NETVSC ,"unable to initialize with netvsp " "(version expected 1 got %d)" , - initPacket->Messages.InitMessages.InitComplete.NegotiatedProtocolVersion); + init_packet->Messages.InitMessages. + InitComplete.NegotiatedProtocolVersion); ret =-1 ; goto Cleanup; }DPRINT_INFO (NETVSC ,"Sending NvspMessage1TypeSendNdisVersion..." );/* Send the ndis version */ -memset (initPacket,0 ,sizeof (struct nvsp_message )); +memset (init_packet,0 ,sizeof (struct nvsp_message )); - ndisVersion =0x00050000 ; + ndis_version =0x00050000 ; - initPacket->Header.MessageType = NvspMessage1TypeSendNdisVersion; - initPacket->Messages.Version1Messages.SendNdisVersion.NdisMajorVersion = - (ndisVersion &0xFFFF0000 ) >>16 ; - initPacket->Messages.Version1Messages.SendNdisVersion.NdisMinorVersion = - ndisVersion &0xFFFF ; + init_packet->Header.MessageType = NvspMessage1TypeSendNdisVersion; + init_packet->Messages.Version1Messages. + SendNdisVersion.NdisMajorVersion = + (ndis_version &0xFFFF0000 ) >>16 ; + init_packet->Messages.Version1Messages. + SendNdisVersion.NdisMinorVersion = + ndis_version &0xFFFF ;/* Send the init request */ - ret =vmbus_sendpacket (Device->channel, initPacket, + ret =vmbus_sendpacket (device->channel, init_packet,sizeof (struct nvsp_message ), - (unsigned long )initPacket, + (unsigned long )init_packet, VmbusPacketTypeDataInBand,0 );if (ret !=0 ) { DPRINT_ERR(NETVSC,
@@ -654,48 +680,48 @@ static int NetVscConnectToVsp(struct hv_device *Device)/* osd_waitevent_wait(NetVscChannel->ChannelInitEvent); */ /* Post the big receive buffer to NetVSP */ - ret =NetVscInitializeReceiveBufferWithNetVsp (Device); + ret =NetVscInitializeReceiveBufferWithNetVsp (device);if (ret ==0 ) - ret =NetVscInitializeSendBufferWithNetVsp (Device); + ret =NetVscInitializeSendBufferWithNetVsp (device); Cleanup: -PutNetDevice (Device); +PutNetDevice (device);return ret; } -static void NetVscDisconnectFromVsp (struct netvsc_device *NetDevice) +static void NetVscDisconnectFromVsp (struct netvsc_device *net_device) { -NetVscDestroyReceiveBuffer (NetDevice); -NetVscDestroySendBuffer (NetDevice); +NetVscDestroyReceiveBuffer (net_device); +NetVscDestroySendBuffer (net_device); }/* * NetVscOnDeviceAdd - Callback when the device belonging to this driver is added */ -static int NetVscOnDeviceAdd (struct hv_device *Device,void *AdditionalInfo) +static int NetVscOnDeviceAdd (struct hv_device *device,void *additional_info) {int ret =0 ;int i; -struct netvsc_device *netDevice; +struct netvsc_device *net_device;struct hv_netvsc_packet *packet, *pos; -struct netvsc_driver *netDriver = - (struct netvsc_driver *)Device->Driver; +struct netvsc_driver *net_driver = + (struct netvsc_driver *)device->Driver; - netDevice =AllocNetDevice (Device); -if (!netDevice) { + net_device =AllocNetDevice (device); +if (!net_device) { ret =-1 ; goto Cleanup; } -DPRINT_DBG (NETVSC ,"netvsc channel object allocated - %p" , netDevice); +DPRINT_DBG (NETVSC ,"netvsc channel object allocated - %p" , net_device);/* Initialize the NetVSC channel extension */ - netDevice->ReceiveBufferSize =NETVSC_RECEIVE_BUFFER_SIZE ; -spin_lock_init (&netDevice->receive_packet_list_lock); + net_device->ReceiveBufferSize =NETVSC_RECEIVE_BUFFER_SIZE ; +spin_lock_init (&net_device->receive_packet_list_lock); - netDevice->SendBufferSize =NETVSC_SEND_BUFFER_SIZE ; + net_device->SendBufferSize =NETVSC_SEND_BUFFER_SIZE ; -INIT_LIST_HEAD (&netDevice->ReceivePacketList); +INIT_LIST_HEAD (&net_device->ReceivePacketList);for (i =0 ; i <NETVSC_RECEIVE_PACKETLIST_COUNT ; i++) { packet = kzalloc(sizeof(struct hv_netvsc_packet) +
@@ -708,18 +734,18 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)break ; }list_add_tail (&packet->ListEntry, - &netDevice->ReceivePacketList); + &net_device->ReceivePacketList); } - netDevice->ChannelInitEvent =osd_waitevent_create (); -if (!netDevice->ChannelInitEvent) { + net_device->ChannelInitEvent =osd_waitevent_create (); +if (!net_device->ChannelInitEvent) { ret = -ENOMEM ; goto Cleanup; }/* Open the channel */ - ret =vmbus_open (Device->channel, netDriver->RingBufferSize, - netDriver->RingBufferSize,NULL ,0 , - NetVscOnChannelCallback, Device); + ret =vmbus_open (device->channel, net_driver->RingBufferSize, + net_driver->RingBufferSize,NULL ,0 , + NetVscOnChannelCallback, device);if (ret !=0 ) {DPRINT_ERR (NETVSC ,"unable to open channel: %d" , ret);
@@ -731,7 +757,7 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)DPRINT_INFO (NETVSC ,"*** NetVSC channel opened successfully! ***" );/* Connect with the NetVsp */ - ret =NetVscConnectToVsp (Device); + ret =NetVscConnectToVsp (device);if (ret !=0 ) {DPRINT_ERR (NETVSC ,"unable to connect to NetVSP - %d" , ret); ret =-1 ;
@@ -745,24 +771,24 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo) close:/* Now, we can close the channel safely */ -vmbus_close (Device->channel); +vmbus_close (device->channel); Cleanup: -if (netDevice) { -kfree (netDevice->ChannelInitEvent); +if (net_device) { +kfree (net_device->ChannelInitEvent);list_for_each_entry_safe (packet, pos, - &netDevice->ReceivePacketList, + &net_device->ReceivePacketList, ListEntry) {list_del (&packet->ListEntry);kfree (packet); } -ReleaseOutboundNetDevice (Device); -ReleaseInboundNetDevice (Device); +ReleaseOutboundNetDevice (device); +ReleaseInboundNetDevice (device); -FreeNetDevice (netDevice); +FreeNetDevice (net_device); }return ret;
@@ -771,53 +797,53 @@ Cleanup:/* * NetVscOnDeviceRemove - Callback when the root bus device is removed */ -static int NetVscOnDeviceRemove (struct hv_device *Device) +static int NetVscOnDeviceRemove (struct hv_device *device) { -struct netvsc_device *netDevice; -struct hv_netvsc_packet *netvscPacket, *pos; +struct netvsc_device *net_device; +struct hv_netvsc_packet *netvsc_packet, *pos;DPRINT_INFO (NETVSC ,"Disabling outbound traffic on net device (%p)..." , - Device->Extension); + device->Extension);/* Stop outbound traffic ie sends and receives completions */ - netDevice =ReleaseOutboundNetDevice (Device); -if (!netDevice) { + net_device =ReleaseOutboundNetDevice (device); +if (!net_device) {DPRINT_ERR (NETVSC ,"No net device present!!" );return -1 ; }/* Wait for all send completions */ -while (atomic_read (&netDevice->NumOutstandingSends)) { +while (atomic_read (&net_device->NumOutstandingSends)) {DPRINT_INFO (NETVSC ,"waiting for %d requests to complete..." , -atomic_read (&netDevice->NumOutstandingSends)); +atomic_read (&net_device->NumOutstandingSends));udelay (100 ); }DPRINT_INFO (NETVSC ,"Disconnecting from netvsp..." ); -NetVscDisconnectFromVsp (netDevice); +NetVscDisconnectFromVsp (net_device);DPRINT_INFO (NETVSC ,"Disabling inbound traffic on net device (%p)..." , - Device->Extension); + device->Extension);/* Stop inbound traffic ie receives and sends completions */ - netDevice =ReleaseInboundNetDevice (Device); + net_device =ReleaseInboundNetDevice (device);/* At this point, no one should be accessing netDevice except in here */ -DPRINT_INFO (NETVSC ,"net device (%p) safe to remove" , netDevice); +DPRINT_INFO (NETVSC ,"net device (%p) safe to remove" , net_device);/* Now, we can close the channel safely */ -vmbus_close (Device->channel); +vmbus_close (device->channel);/* Release all resources */ -list_for_each_entry_safe (netvscPacket, pos, - &netDevice->ReceivePacketList, ListEntry) { -list_del (&netvscPacket->ListEntry); -kfree (netvscPacket); +list_for_each_entry_safe (netvsc_packet, pos, + &net_device->ReceivePacketList, ListEntry) { +list_del (&netvsc_packet->ListEntry); +kfree (netvsc_packet); } -kfree (netDevice->ChannelInitEvent); -FreeNetDevice (netDevice); +kfree (net_device->ChannelInitEvent); +FreeNetDevice (net_device);return 0 ; }
@@ -828,69 +854,72 @@ static void NetVscOnCleanup(struct hv_driver *drv) { } -static void NetVscOnSendCompletion (struct hv_device *Device, -struct vmpacket_descriptor *Packet) +static void NetVscOnSendCompletion (struct hv_device *device, +struct vmpacket_descriptor *packet) { -struct netvsc_device *netDevice; -struct nvsp_message *nvspPacket; -struct hv_netvsc_packet *nvscPacket; +struct netvsc_device *net_device; +struct nvsp_message *nvsp_packet; +struct hv_netvsc_packet *nvsc_packet; - netDevice =GetInboundNetDevice (Device); -if (!netDevice) { + net_device =GetInboundNetDevice (device); +if (!net_device) {DPRINT_ERR (NETVSC ,"unable to get net device..." "device being destroyed?" );return ; } - nvspPacket = (struct nvsp_message *)((unsigned long )Packet + (Packet->DataOffset8 <<3 )); + nvsp_packet = (struct nvsp_message *)((unsigned long )packet + + (packet->DataOffset8 <<3 ));DPRINT_DBG (NETVSC ,"send completion packet - type %d" , - nvspPacket->Header.MessageType); + nvsp_packet->Header.MessageType); -if ((nvspPacket->Header.MessageType == NvspMessageTypeInitComplete) || - (nvspPacket->Header.MessageType == +if ((nvsp_packet->Header.MessageType == NvspMessageTypeInitComplete) || + (nvsp_packet->Header.MessageType == NvspMessage1TypeSendReceiveBufferComplete) || - (nvspPacket->Header.MessageType == + (nvsp_packet->Header.MessageType == NvspMessage1TypeSendSendBufferComplete)) {/* Copy the response back */ -memcpy (&netDevice->ChannelInitPacket, nvspPacket, +memcpy (&net_device->ChannelInitPacket, nvsp_packet,sizeof (struct nvsp_message )); -osd_waitevent_set (netDevice->ChannelInitEvent); - }else if (nvspPacket->Header.MessageType == +osd_waitevent_set (net_device->ChannelInitEvent); + }else if (nvsp_packet->Header.MessageType == NvspMessage1TypeSendRNDISPacketComplete) {/* Get the send context */ - nvscPacket = (struct hv_netvsc_packet *)(unsigned long )Packet->TransactionId; + nvsc_packet = (struct hv_netvsc_packet *)(unsigned long ) + packet->TransactionId;/* ASSERT(nvscPacket); */ /* Notify the layer above us */ - nvscPacket->Completion.Send.OnSendCompletion (nvscPacket->Completion.Send.SendCompletionContext); + nvsc_packet->Completion.Send.OnSendCompletion ( + nvsc_packet->Completion.Send.SendCompletionContext); -atomic_dec (&netDevice->NumOutstandingSends); +atomic_dec (&net_device->NumOutstandingSends); }else {DPRINT_ERR (NETVSC ,"Unknown send completion packet type - " -"%d received!!" , nvspPacket->Header.MessageType); +"%d received!!" , nvsp_packet->Header.MessageType); } -PutNetDevice (Device); +PutNetDevice (device); } -static int NetVscOnSend (struct hv_device *Device, -struct hv_netvsc_packet *Packet) +static int NetVscOnSend (struct hv_device *device, +struct hv_netvsc_packet *packet) { -struct netvsc_device *netDevice; +struct netvsc_device *net_device;int ret =0 ;struct nvsp_message sendMessage; - netDevice =GetOutboundNetDevice (Device); -if (!netDevice) { + net_device =GetOutboundNetDevice (device); +if (!net_device) {DPRINT_ERR (NETVSC ,"net device (%p) shutting down..." -"ignoring outbound packets" , netDevice); +"ignoring outbound packets" , net_device);return -2 ; } sendMessage.Header.MessageType = NvspMessage1TypeSendRNDISPacket; -if (Packet->IsDataPacket) { +if (packet->IsDataPacket) {/* 0 is RMC_DATA; */ sendMessage.Messages.Version1Messages.SendRNDISPacket.ChannelType =0 ; }else {
@@ -902,17 +931,17 @@ static int NetVscOnSend(struct hv_device *Device, sendMessage.Messages.Version1Messages.SendRNDISPacket.SendBufferSectionIndex =0xFFFFFFFF ; sendMessage.Messages.Version1Messages.SendRNDISPacket.SendBufferSectionSize =0 ; -if (Packet->PageBufferCount) { - ret =vmbus_sendpacket_pagebuffer (Device->channel, - Packet->PageBuffers, - Packet->PageBufferCount, +if (packet->PageBufferCount) { + ret =vmbus_sendpacket_pagebuffer (device->channel, + packet->PageBuffers, + packet->PageBufferCount, &sendMessage,sizeof (struct nvsp_message ), - (unsigned long )Packet); + (unsigned long )packet); }else { - ret =vmbus_sendpacket (Device->channel, &sendMessage, + ret =vmbus_sendpacket (device->channel, &sendMessage,sizeof (struct nvsp_message ), - (unsigned long )Packet, + (unsigned long )packet, VmbusPacketTypeDataInBand,VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED );
@@ -920,31 +949,31 @@ static int NetVscOnSend(struct hv_device *Device,if (ret !=0 )DPRINT_ERR (NETVSC ,"Unable to send packet %p ret %d" , - Packet, ret); + packet, ret); -atomic_inc (&netDevice->NumOutstandingSends); -PutNetDevice (Device); +atomic_inc (&net_device->NumOutstandingSends); +PutNetDevice (device);return ret; } -static void NetVscOnReceive (struct hv_device *Device, -struct vmpacket_descriptor *Packet) +static void NetVscOnReceive (struct hv_device *device, +struct vmpacket_descriptor *packet) { -struct netvsc_device *netDevice; -struct vmtransfer_page_packet_header *vmxferpagePacket; -struct nvsp_message *nvspPacket; -struct hv_netvsc_packet *netvscPacket =NULL ; +struct netvsc_device *net_device; +struct vmtransfer_page_packet_header *vmxferpage_packet; +struct nvsp_message *nvsp_packet; +struct hv_netvsc_packet *netvsc_packet =NULL ;unsigned long start; -unsigned long end, endVirtual; +unsigned long end, end_virtual;/* struct netvsc_driver *netvscDriver; */ -struct xferpage_packet *xferpagePacket =NULL ; +struct xferpage_packet *xferpage_packet =NULL ;int i, j; -int count =0 , bytesRemain =0 ; +int count =0 , bytes_remain =0 ;unsigned long flags;LIST_HEAD (listHead); - netDevice =GetInboundNetDevice (Device); -if (!netDevice) { + net_device =GetInboundNetDevice (device); +if (!net_device) {DPRINT_ERR (NETVSC ,"unable to get net device..." "device being destroyed?" );return ;
@@ -954,39 +983,40 @@ static void NetVscOnReceive(struct hv_device *Device,* All inbound packets other than send completion should be xfer page * packet */ -if (Packet->Type != VmbusPacketTypeDataUsingTransferPages) { +if (packet->Type != VmbusPacketTypeDataUsingTransferPages) {DPRINT_ERR (NETVSC ,"Unknown packet type received - %d" , - Packet->Type); -PutNetDevice (Device); + packet->Type); +PutNetDevice (device);return ; } - nvspPacket = (struct nvsp_message *)((unsigned long )Packet + - (Packet->DataOffset8 <<3 )); + nvsp_packet = (struct nvsp_message *)((unsigned long )packet + + (packet->DataOffset8 <<3 ));/* Make sure this is a valid nvsp packet */ -if (nvspPacket->Header.MessageType != NvspMessage1TypeSendRNDISPacket) { +if (nvsp_packet->Header.MessageType != + NvspMessage1TypeSendRNDISPacket) {DPRINT_ERR (NETVSC ,"Unknown nvsp packet type received - %d" , - nvspPacket->Header.MessageType); -PutNetDevice (Device); + nvsp_packet->Header.MessageType); +PutNetDevice (device);return ; }DPRINT_DBG (NETVSC ,"NVSP packet received - type %d" , - nvspPacket->Header.MessageType); + nvsp_packet->Header.MessageType); - vmxferpagePacket = (struct vmtransfer_page_packet_header *)Packet; + vmxferpage_packet = (struct vmtransfer_page_packet_header *)packet; -if (vmxferpagePacket->TransferPageSetId !=NETVSC_RECEIVE_BUFFER_ID ) { +if (vmxferpage_packet->TransferPageSetId !=NETVSC_RECEIVE_BUFFER_ID ) {DPRINT_ERR (NETVSC ,"Invalid xfer page set id - " "expecting %x got %x" ,NETVSC_RECEIVE_BUFFER_ID , - vmxferpagePacket->TransferPageSetId); -PutNetDevice (Device); + vmxferpage_packet->TransferPageSetId); +PutNetDevice (device);return ; }DPRINT_DBG (NETVSC ,"xfer page - range count %d" , - vmxferpagePacket->RangeCount); + vmxferpage_packet->RangeCount);/* * Grab free packets (range count + 1) to represent this xfer
@@ -994,13 +1024,13 @@ static void NetVscOnReceive(struct hv_device *Device,* We grab it here so that we know exactly how many we can * fulfil */ -spin_lock_irqsave (&netDevice->receive_packet_list_lock, flags); -while (!list_empty (&netDevice->ReceivePacketList)) { -list_move_tail (netDevice->ReceivePacketList.next, &listHead); -if (++count == vmxferpagePacket->RangeCount +1 ) +spin_lock_irqsave (&net_device->receive_packet_list_lock, flags); +while (!list_empty (&net_device->ReceivePacketList)) { +list_move_tail (net_device->ReceivePacketList.next, &listHead); +if (++count == vmxferpage_packet->RangeCount +1 )break ; } -spin_unlock_irqrestore (&netDevice->receive_packet_list_lock, flags); +spin_unlock_irqrestore (&net_device->receive_packet_list_lock, flags);/* * We need at least 2 netvsc pkts (1 to represent the xfer
@@ -1010,129 +1040,137 @@ static void NetVscOnReceive(struct hv_device *Device,if (count <2 ) {DPRINT_ERR (NETVSC ,"Got only %d netvsc pkt...needed %d pkts. " "Dropping this xfer page packet completely!" , - count, vmxferpagePacket->RangeCount +1 ); + count, vmxferpage_packet->RangeCount +1 );/* Return it to the freelist */ -spin_lock_irqsave (&netDevice->receive_packet_list_lock, flags); +spin_lock_irqsave (&net_device->receive_packet_list_lock, flags);for (i = count; i !=0 ; i--) {list_move_tail (listHead.next, - &netDevice->ReceivePacketList); + &net_device->ReceivePacketList); } -spin_unlock_irqrestore (&netDevice->receive_packet_list_lock, +spin_unlock_irqrestore (&net_device->receive_packet_list_lock, flags); -NetVscSendReceiveCompletion (Device, - vmxferpagePacket->d.TransactionId); +NetVscSendReceiveCompletion (device, + vmxferpage_packet->d.TransactionId); -PutNetDevice (Device); +PutNetDevice (device);return ; }/* Remove the 1st packet to represent the xfer page packet itself */ - xferpagePacket = (struct xferpage_packet *)listHead.next; -list_del (&xferpagePacket->ListEntry); + xferpage_packet = (struct xferpage_packet *)listHead.next; +list_del (&xferpage_packet->ListEntry);/* This is how much we can satisfy */ - xferpagePacket->Count = count -1 ; + xferpage_packet->Count = count -1 ;/* ASSERT(xferpagePacket->Count > 0 && xferpagePacket->Count <= */ /* vmxferpagePacket->RangeCount); */ -if (xferpagePacket->Count != vmxferpagePacket->RangeCount) { +if (xferpage_packet->Count != vmxferpage_packet->RangeCount) {DPRINT_INFO (NETVSC ,"Needed %d netvsc pkts to satisy this xfer " -"page...got %d" , vmxferpagePacket->RangeCount, - xferpagePacket->Count); +"page...got %d" , vmxferpage_packet->RangeCount, + xferpage_packet->Count); }/* Each range represents 1 RNDIS pkt that contains 1 ethernet frame */ for (i =0 ; i < (count -1 ); i++) { - netvscPacket = (struct hv_netvsc_packet *)listHead.next; -list_del (&netvscPacket->ListEntry); + netvsc_packet = (struct hv_netvsc_packet *)listHead.next; +list_del (&netvsc_packet->ListEntry);/* Initialize the netvsc packet */ - netvscPacket->XferPagePacket = xferpagePacket; - netvscPacket->Completion.Recv.OnReceiveCompletion = + netvsc_packet->XferPagePacket = xferpage_packet; + netvsc_packet->Completion.Recv.OnReceiveCompletion = NetVscOnReceiveCompletion; - netvscPacket->Completion.Recv.ReceiveCompletionContext = - netvscPacket; - netvscPacket->Device = Device; + netvsc_packet->Completion.Recv.ReceiveCompletionContext = + netvsc_packet; + netvsc_packet->Device = device;/* Save this so that we can send it back */ - netvscPacket->Completion.Recv.ReceiveCompletionTid = - vmxferpagePacket->d.TransactionId; + netvsc_packet->Completion.Recv.ReceiveCompletionTid = + vmxferpage_packet->d.TransactionId; - netvscPacket->TotalDataBufferLength = - vmxferpagePacket->Ranges[i].ByteCount; - netvscPacket->PageBufferCount =1 ; + netvsc_packet->TotalDataBufferLength = + vmxferpage_packet->Ranges[i].ByteCount; + netvsc_packet->PageBufferCount =1 ;/* ASSERT(vmxferpagePacket->Ranges[i].ByteOffset + */ /* vmxferpagePacket->Ranges[i].ByteCount < */ /* netDevice->ReceiveBufferSize); */ - netvscPacket->PageBuffers[0 ].Length = - vmxferpagePacket->Ranges[i].ByteCount; + netvsc_packet->PageBuffers[0 ].Length = + vmxferpage_packet->Ranges[i].ByteCount; - start =virt_to_phys ((void *)((unsigned long )netDevice->ReceiveBuffer + vmxferpagePacket->Ranges[i].ByteOffset)); + start =virt_to_phys ((void *)((unsigned long )net_device-> + ReceiveBuffer + vmxferpage_packet->Ranges[i].ByteOffset)); - netvscPacket->PageBuffers[0 ].Pfn = start >>PAGE_SHIFT ; - endVirtual = (unsigned long )netDevice->ReceiveBuffer - + vmxferpagePacket->Ranges[i].ByteOffset - + vmxferpagePacket->Ranges[i].ByteCount -1 ; - end =virt_to_phys ((void *)endVirtual); + netvsc_packet->PageBuffers[0 ].Pfn = start >>PAGE_SHIFT ; + end_virtual = (unsigned long )net_device->ReceiveBuffer + + vmxferpage_packet->Ranges[i].ByteOffset + + vmxferpage_packet->Ranges[i].ByteCount -1 ; + end =virt_to_phys ((void *)end_virtual);/* Calculate the page relative offset */ - netvscPacket->PageBuffers[0 ].Offset = - vmxferpagePacket->Ranges[i].ByteOffset & (PAGE_SIZE -1 ); + netvsc_packet->PageBuffers[0 ].Offset = + vmxferpage_packet->Ranges[i].ByteOffset & + (PAGE_SIZE -1 );if ((end >>PAGE_SHIFT ) != (start >>PAGE_SHIFT )) {/* Handle frame across multiple pages: */ - netvscPacket->PageBuffers[0 ].Length = - (netvscPacket->PageBuffers[0 ].Pfn <<PAGE_SHIFT ) + netvsc_packet->PageBuffers[0 ].Length = + (netvsc_packet->PageBuffers[0 ].Pfn << +PAGE_SHIFT ) +PAGE_SIZE - start; - bytesRemain = netvscPacket->TotalDataBufferLength - - netvscPacket->PageBuffers[0 ].Length; + bytes_remain = netvsc_packet->TotalDataBufferLength - + netvsc_packet->PageBuffers[0 ].Length;for (j =1 ; j <NETVSC_PACKET_MAXPAGE ; j++) { - netvscPacket->PageBuffers[j].Offset =0 ; -if (bytesRemain <=PAGE_SIZE ) { - netvscPacket->PageBuffers[j].Length = bytesRemain; - bytesRemain =0 ; + netvsc_packet->PageBuffers[j].Offset =0 ; +if (bytes_remain <=PAGE_SIZE ) { + netvsc_packet->PageBuffers[j].Length = + bytes_remain; + bytes_remain =0 ; }else { - netvscPacket->PageBuffers[j].Length =PAGE_SIZE ; - bytesRemain -=PAGE_SIZE ; + netvsc_packet->PageBuffers[j].Length = +PAGE_SIZE ; + bytes_remain -=PAGE_SIZE ; } - netvscPacket->PageBuffers[j].Pfn = -virt_to_phys ((void *)(endVirtual - bytesRemain)) >>PAGE_SHIFT ; - netvscPacket->PageBufferCount++; -if (bytesRemain ==0 ) + netvsc_packet->PageBuffers[j].Pfn = +virt_to_phys ((void *)(end_virtual - + bytes_remain)) >>PAGE_SHIFT ; + netvsc_packet->PageBufferCount++; +if (bytes_remain ==0 )break ; }/* ASSERT(bytesRemain == 0); */ }DPRINT_DBG (NETVSC ,"[%d] - (abs offset %u len %u) => " "(pfn %llx, offset %u, len %u)" , i, - vmxferpagePacket->Ranges[i].ByteOffset, - vmxferpagePacket->Ranges[i].ByteCount, - netvscPacket->PageBuffers[0 ].Pfn, - netvscPacket->PageBuffers[0 ].Offset, - netvscPacket->PageBuffers[0 ].Length); + vmxferpage_packet->Ranges[i].ByteOffset, + vmxferpage_packet->Ranges[i].ByteCount, + netvsc_packet->PageBuffers[0 ].Pfn, + netvsc_packet->PageBuffers[0 ].Offset, + netvsc_packet->PageBuffers[0 ].Length);/* Pass it to the upper layer */ - ((struct netvsc_driver *)Device->Driver)->OnReceiveCallback (Device, netvscPacket); + ((struct netvsc_driver *)device->Driver)-> +OnReceiveCallback (device, netvsc_packet); -NetVscOnReceiveCompletion (netvscPacket->Completion.Recv.ReceiveCompletionContext); +NetVscOnReceiveCompletion (netvsc_packet-> + Completion.Recv.ReceiveCompletionContext); }/* ASSERT(list_empty(&listHead)); */ -PutNetDevice (Device); +PutNetDevice (device); } -static void NetVscSendReceiveCompletion (struct hv_device *Device, -u64 TransactionId) +static void NetVscSendReceiveCompletion (struct hv_device *device, +u64 transaction_id) {struct nvsp_message recvcompMessage;int retries =0 ;int ret;DPRINT_DBG (NETVSC ,"Sending receive completion pkt - %llx" , - TransactionId); + transaction_id); recvcompMessage.Header.MessageType = NvspMessage1TypeSendRNDISPacketComplete;
@@ -1142,8 +1180,8 @@ static void NetVscSendReceiveCompletion(struct hv_device *Device, retry_send_cmplt:/* Send the completion */ - ret =vmbus_sendpacket (Device->channel, &recvcompMessage, -sizeof (struct nvsp_message ), TransactionId, + ret =vmbus_sendpacket (device->channel, &recvcompMessage, +sizeof (struct nvsp_message ), transaction_id, VmbusPacketTypeCompletion,0 );if (ret ==0 ) {/* success */
@@ -1152,7 +1190,7 @@ retry_send_cmplt:/* no more room...wait a bit and attempt to retry 3 times */ retries++;DPRINT_ERR (NETVSC ,"unable to send receive completion pkt " -"(tid %llx)...retrying %d" , TransactionId, retries); +"(tid %llx)...retrying %d" , transaction_id, retries);if (retries <4 ) {udelay (100 );
@@ -1160,22 +1198,22 @@ retry_send_cmplt: }else {DPRINT_ERR (NETVSC ,"unable to send receive completion " "pkt (tid %llx)...give up retrying" , - TransactionId); + transaction_id); } }else {DPRINT_ERR (NETVSC ,"unable to send receive completion pkt - " -"%llx" , TransactionId); +"%llx" , transaction_id); } }/* Send a receive completion packet to RNDIS device (ie NetVsp) */ -static void NetVscOnReceiveCompletion (void *Context) +static void NetVscOnReceiveCompletion (void *context) { -struct hv_netvsc_packet *packet = Context; +struct hv_netvsc_packet *packet = context;struct hv_device *device = (struct hv_device *)packet->Device; -struct netvsc_device *netDevice; -u64 transactionId =0 ; -bool fSendReceiveComp = false; +struct netvsc_device *net_device; +u64 transaction_id =0 ; +bool fsend_receive_comp = false;unsigned long flags;/* ASSERT(packet->XferPagePacket); */
@@ -1185,15 +1223,15 @@ static void NetVscOnReceiveCompletion(void *Context)* send out receive completion, we are using GetInboundNetDevice() * since we may have disable outbound traffic already. */ - netDevice =GetInboundNetDevice (device); -if (!netDevice) { + net_device =GetInboundNetDevice (device); +if (!net_device) {DPRINT_ERR (NETVSC ,"unable to get net device..." "device being destroyed?" );return ; }/* Overloading use of the lock. */ -spin_lock_irqsave (&netDevice->receive_packet_list_lock, flags); +spin_lock_irqsave (&net_device->receive_packet_list_lock, flags);/* ASSERT(packet->XferPagePacket->Count > 0); */ packet->XferPagePacket->Count--;
@@ -1203,31 +1241,31 @@ static void NetVscOnReceiveCompletion(void *Context)* Return the xfer page packet itself to the freelist */ if (packet->XferPagePacket->Count ==0 ) { - fSendReceiveComp = true; - transactionId = packet->Completion.Recv.ReceiveCompletionTid; + fsend_receive_comp = true; + transaction_id = packet->Completion.Recv.ReceiveCompletionTid;list_add_tail (&packet->XferPagePacket->ListEntry, - &netDevice->ReceivePacketList); + &net_device->ReceivePacketList); }/* Put the packet back */ -list_add_tail (&packet->ListEntry, &netDevice->ReceivePacketList); -spin_unlock_irqrestore (&netDevice->receive_packet_list_lock, flags); +list_add_tail (&packet->ListEntry, &net_device->ReceivePacketList); +spin_unlock_irqrestore (&net_device->receive_packet_list_lock, flags);/* Send a receive completion for the xfer page packet */ -if (fSendReceiveComp) -NetVscSendReceiveCompletion (device, transactionId); +if (fsend_receive_comp) +NetVscSendReceiveCompletion (device, transaction_id);PutNetDevice (device); } -static void NetVscOnChannelCallback (void *Context) +static void NetVscOnChannelCallback (void *context) {int ret; -struct hv_device *device = Context; -struct netvsc_device *netDevice; -u32 bytesRecvd; -u64 requestId; +struct hv_device *device = context; +struct netvsc_device *net_device; +u32 bytes_recvd; +u64 request_id;unsigned char *packet;struct vmpacket_descriptor *desc;unsigned char *buffer;
@@ -1241,20 +1279,20 @@ static void NetVscOnChannelCallback(void *Context)return ; buffer = packet; - netDevice =GetInboundNetDevice (device); -if (!netDevice) { + net_device =GetInboundNetDevice (device); +if (!net_device) {DPRINT_ERR (NETVSC ,"net device (%p) shutting down..." -"ignoring inbound packets" , netDevice); +"ignoring inbound packets" , net_device); goto out; } do { ret = vmbus_recvpacket_raw(device->channel, buffer, bufferlen, - &bytesRecvd, &requestId); + &bytes_recvd, &request_id); if (ret == 0) { - if (bytesRecvd > 0) { + if (bytes_recvd > 0) { DPRINT_DBG(NETVSC, "receive %d bytes, tid %llx", - bytesRecvd, requestId); + bytes_recvd, request_id); desc = (struct vmpacket_descriptor *)buffer; switch (desc->Type) {
@@ -1270,8 +1308,8 @@ static void NetVscOnChannelCallback(void *Context)DPRINT_ERR (NETVSC ,"unhandled packet type %d, " "tid %llx len %d\n" , - desc->Type, requestId, - bytesRecvd); + desc->Type, request_id, + bytes_recvd);break ; }
@@ -1293,16 +1331,16 @@ static void NetVscOnChannelCallback(void *Context) } }else if (ret ==-2 ) {/* Handle large packet */ - buffer =kmalloc (bytesRecvd,GFP_ATOMIC ); + buffer =kmalloc (bytes_recvd,GFP_ATOMIC );if (buffer ==NULL ) {/* Try again next time around */ DPRINT_ERR (NETVSC ,"unable to allocate buffer of size " -"(%d)!!" , bytesRecvd); +"(%d)!!" , bytes_recvd);break ; } - bufferlen = bytesRecvd; + bufferlen = bytes_recvd; } }while (1 );
Signature · 1 line
1.6.3.2
PATCH 2/7 staging: hv: Convert camel cased functions in netvsc.c to lower cases
--- drivers/staging/hv/netvsc.c | 173 ++++++++++++++++++++------------------- drivers/staging/hv/netvsc_api.h | 2 +- drivers/staging/hv/netvsc_drv.c | 2 +- 3 files changed, 90 insertions(+), 87 deletions(-)
drivers/staging/hv/netvsc.c +88 -85
@@ -41,40 +41,40 @@ static const struct hv_guid netvsc_device_type = { } }; -static int NetVscOnDeviceAdd (struct hv_device *device,void *additional_info); +static int netvsc_device_add (struct hv_device *device,void *additional_info); -static int NetVscOnDeviceRemove (struct hv_device *device); +static int netvsc_device_remove (struct hv_device *device); -static void NetVscOnCleanup (struct hv_driver *driver); +static void netvsc_cleanup (struct hv_driver *driver); -static void NetVscOnChannelCallback (void *context); +static void netvsc_channel_cb (void *context); -static int NetVscInitializeSendBufferWithNetVsp (struct hv_device *device); +static int netvsc_init_send_buf (struct hv_device *device); -static int NetVscInitializeReceiveBufferWithNetVsp (struct hv_device *device); +static int netvsc_init_recv_buf (struct hv_device *device); -static int NetVscDestroySendBuffer (struct netvsc_device *net_device); +static int netvsc_destroy_send_buf (struct netvsc_device *net_device); -static int NetVscDestroyReceiveBuffer (struct netvsc_device *net_device); +static int netvsc_destroy_recv_buf (struct netvsc_device *net_device); -static int NetVscConnectToVsp (struct hv_device *device); +static int netvsc_connect_vsp (struct hv_device *device); -static void NetVscOnSendCompletion (struct hv_device *device, +static void netvsc_send_completion (struct hv_device *device,struct vmpacket_descriptor *packet); -static int NetVscOnSend (struct hv_device *device, +static int netvsc_send (struct hv_device *device,struct hv_netvsc_packet *packet); -static void NetVscOnReceive (struct hv_device *device, +static void netvsc_receive (struct hv_device *device,struct vmpacket_descriptor *packet); -static void NetVscOnReceiveCompletion (void *context); +static void netvsc_receive_completion (void *context); -static void NetVscSendReceiveCompletion (struct hv_device *device, +static void netvsc_send_recv_completion (struct hv_device *device,u64 transaction_id); -static struct netvsc_device *AllocNetDevice (struct hv_device *device) +static struct netvsc_device *alloc_net_device (struct hv_device *device) {struct netvsc_device *net_device;
@@ -91,7 +91,7 @@ static struct netvsc_device *AllocNetDevice(struct hv_device *device)return net_device; } -static void FreeNetDevice (struct netvsc_device *device) +static void free_net_device (struct netvsc_device *device) {WARN_ON (atomic_read (&device->RefCount) ==0 ); device->Device->Extension =NULL ;
@@ -100,7 +100,7 @@ static void FreeNetDevice(struct netvsc_device *device)/* Get the net device object iff exists and its refcount > 1 */ -static struct netvsc_device *GetOutboundNetDevice (struct hv_device *device) +static struct netvsc_device *get_outbound_net_device (struct hv_device *device) {struct netvsc_device *net_device;
@@ -114,7 +114,7 @@ static struct netvsc_device *GetOutboundNetDevice(struct hv_device *device) }/* Get the net device object iff exists and its refcount > 0 */ -static struct netvsc_device *GetInboundNetDevice (struct hv_device *device) +static struct netvsc_device *get_inbound_net_device (struct hv_device *device) {struct netvsc_device *net_device;
@@ -127,7 +127,7 @@ static struct netvsc_device *GetInboundNetDevice(struct hv_device *device)return net_device; } -static void PutNetDevice (struct hv_device *device) +static void put_net_device (struct hv_device *device) {struct netvsc_device *net_device;
@@ -137,7 +137,8 @@ static void PutNetDevice(struct hv_device *device)atomic_dec (&net_device->RefCount); } -static struct netvsc_device *ReleaseOutboundNetDevice (struct hv_device *device) +static struct netvsc_device *release_outbound_net_device ( +struct hv_device *device) {struct netvsc_device *net_device;
@@ -152,7 +153,8 @@ static struct netvsc_device *ReleaseOutboundNetDevice(struct hv_device *device)return net_device; } -static struct netvsc_device *ReleaseInboundNetDevice (struct hv_device *device) +static struct netvsc_device *release_inbound_net_device ( +struct hv_device *device) {struct netvsc_device *net_device;
@@ -169,9 +171,9 @@ static struct netvsc_device *ReleaseInboundNetDevice(struct hv_device *device) }/* -* NetVscInitialize - Main entry point +* netvsc_initialize - Main entry point */ -int NetVscInitialize (struct hv_driver *drv) +int netvsc_initialize (struct hv_driver *drv) {struct netvsc_driver *driver = (struct netvsc_driver *)drv;
@@ -194,23 +196,23 @@ int NetVscInitialize(struct hv_driver *drv)/* ASSERT(driver->OnLinkStatusChanged); */ /* Setup the dispatch table */ - driver->Base.OnDeviceAdd = NetVscOnDeviceAdd; - driver->Base.OnDeviceRemove = NetVscOnDeviceRemove; - driver->Base.OnCleanup = NetVscOnCleanup; + driver->Base.OnDeviceAdd = netvsc_device_add; + driver->Base.OnDeviceRemove = netvsc_device_remove; + driver->Base.OnCleanup = netvsc_cleanup; - driver->OnSend = NetVscOnSend; + driver->OnSend = netvsc_send;RndisFilterInit (driver);return 0 ; } -static int NetVscInitializeReceiveBufferWithNetVsp (struct hv_device *device) +static int netvsc_init_recv_buf (struct hv_device *device) {int ret =0 ;struct netvsc_device *net_device;struct nvsp_message *init_packet; - net_device =GetOutboundNetDevice (device); + net_device =get_outbound_net_device (device);if (!net_device) {DPRINT_ERR (NETVSC ,"unable to get net device..." "device being destroyed?" );
@@ -330,20 +332,20 @@ static int NetVscInitializeReceiveBufferWithNetVsp(struct hv_device *device) goto Exit; Cleanup: -NetVscDestroyReceiveBuffer (net_device); +netvsc_destroy_recv_buf (net_device); Exit: -PutNetDevice (device); +put_net_device (device);return ret; } -static int NetVscInitializeSendBufferWithNetVsp (struct hv_device *device) +static int netvsc_init_send_buf (struct hv_device *device) {int ret =0 ;struct netvsc_device *net_device;struct nvsp_message *init_packet; - net_device =GetOutboundNetDevice (device); + net_device =get_outbound_net_device (device);if (!net_device) {DPRINT_ERR (NETVSC ,"unable to get net device..." "device being destroyed?" );
@@ -429,14 +431,14 @@ static int NetVscInitializeSendBufferWithNetVsp(struct hv_device *device) goto Exit; Cleanup: -NetVscDestroySendBuffer (net_device); +netvsc_destroy_send_buf (net_device); Exit: -PutNetDevice (device); +put_net_device (device);return ret; } -static int NetVscDestroyReceiveBuffer (struct netvsc_device *net_device) +static int netvsc_destroy_recv_buf (struct netvsc_device *net_device) {struct nvsp_message *revoke_packet;int ret =0 ;
@@ -510,7 +512,7 @@ static int NetVscDestroyReceiveBuffer(struct netvsc_device *net_device)return ret; } -static int NetVscDestroySendBuffer (struct netvsc_device *net_device) +static int netvsc_destroy_send_buf (struct netvsc_device *net_device) {struct nvsp_message *revoke_packet;int ret =0 ;
@@ -581,14 +583,14 @@ static int NetVscDestroySendBuffer(struct netvsc_device *net_device) } -static int NetVscConnectToVsp (struct hv_device *device) +static int netvsc_connect_vsp (struct hv_device *device) {int ret;struct netvsc_device *net_device;struct nvsp_message *init_packet;int ndis_version; - net_device =GetOutboundNetDevice (device); + net_device =get_outbound_net_device (device);if (!net_device) {DPRINT_ERR (NETVSC ,"unable to get net device..." "device being destroyed?" );
@@ -680,25 +682,26 @@ static int NetVscConnectToVsp(struct hv_device *device)/* osd_waitevent_wait(NetVscChannel->ChannelInitEvent); */ /* Post the big receive buffer to NetVSP */ - ret =NetVscInitializeReceiveBufferWithNetVsp (device); + ret =netvsc_init_recv_buf (device);if (ret ==0 ) - ret =NetVscInitializeSendBufferWithNetVsp (device); + ret =netvsc_init_send_buf (device); Cleanup: -PutNetDevice (device); +put_net_device (device);return ret; }static void NetVscDisconnectFromVsp (struct netvsc_device *net_device) { -NetVscDestroyReceiveBuffer (net_device); -NetVscDestroySendBuffer (net_device); +netvsc_destroy_recv_buf (net_device); +netvsc_destroy_send_buf (net_device); }/* -* NetVscOnDeviceAdd - Callback when the device belonging to this driver is added +* netvsc_device_add - Callback when the device belonging to this +* driver is added */ -static int NetVscOnDeviceAdd (struct hv_device *device,void *additional_info) +static int netvsc_device_add (struct hv_device *device,void *additional_info) {int ret =0 ;int i;
@@ -707,7 +710,7 @@ static int NetVscOnDeviceAdd(struct hv_device *device, void *additional_info)struct netvsc_driver *net_driver = (struct netvsc_driver *)device->Driver; - net_device =AllocNetDevice (device); + net_device =alloc_net_device (device);if (!net_device) { ret =-1 ; goto Cleanup;
@@ -745,7 +748,7 @@ static int NetVscOnDeviceAdd(struct hv_device *device, void *additional_info)/* Open the channel */ ret =vmbus_open (device->channel, net_driver->RingBufferSize, net_driver->RingBufferSize,NULL ,0 , - NetVscOnChannelCallback, device); + netvsc_channel_cb, device);if (ret !=0 ) {DPRINT_ERR (NETVSC ,"unable to open channel: %d" , ret);
@@ -757,7 +760,7 @@ static int NetVscOnDeviceAdd(struct hv_device *device, void *additional_info)DPRINT_INFO (NETVSC ,"*** NetVSC channel opened successfully! ***" );/* Connect with the NetVsp */ - ret =NetVscConnectToVsp (device); + ret =netvsc_connect_vsp (device);if (ret !=0 ) {DPRINT_ERR (NETVSC ,"unable to connect to NetVSP - %d" , ret); ret =-1 ;
@@ -785,19 +788,19 @@ Cleanup:kfree (packet); } -ReleaseOutboundNetDevice (device); -ReleaseInboundNetDevice (device); +release_outbound_net_device (device); +release_inbound_net_device (device); -FreeNetDevice (net_device); +free_net_device (net_device); }return ret; }/* -* NetVscOnDeviceRemove - Callback when the root bus device is removed +* netvsc_device_remove - Callback when the root bus device is removed */ -static int NetVscOnDeviceRemove (struct hv_device *device) +static int netvsc_device_remove (struct hv_device *device) {struct netvsc_device *net_device;struct hv_netvsc_packet *netvsc_packet, *pos;
@@ -806,7 +809,7 @@ static int NetVscOnDeviceRemove(struct hv_device *device) device->Extension);/* Stop outbound traffic ie sends and receives completions */ - net_device =ReleaseOutboundNetDevice (device); + net_device =release_outbound_net_device (device);if (!net_device) {DPRINT_ERR (NETVSC ,"No net device present!!" );return -1 ;
@@ -827,7 +830,7 @@ static int NetVscOnDeviceRemove(struct hv_device *device) device->Extension);/* Stop inbound traffic ie receives and sends completions */ - net_device =ReleaseInboundNetDevice (device); + net_device =release_inbound_net_device (device);/* At this point, no one should be accessing netDevice except in here */ DPRINT_INFO (NETVSC ,"net device (%p) safe to remove" , net_device);
@@ -843,25 +846,25 @@ static int NetVscOnDeviceRemove(struct hv_device *device) }kfree (net_device->ChannelInitEvent); -FreeNetDevice (net_device); +free_net_device (net_device);return 0 ; }/* -* NetVscOnCleanup - Perform any cleanup when the driver is removed +* netvsc_cleanup - Perform any cleanup when the driver is removed */ -static void NetVscOnCleanup (struct hv_driver *drv) +static void netvsc_cleanup (struct hv_driver *drv) { } -static void NetVscOnSendCompletion (struct hv_device *device, +static void netvsc_send_completion (struct hv_device *device,struct vmpacket_descriptor *packet) {struct netvsc_device *net_device;struct nvsp_message *nvsp_packet;struct hv_netvsc_packet *nvsc_packet; - net_device =GetInboundNetDevice (device); + net_device =get_inbound_net_device (device);if (!net_device) {DPRINT_ERR (NETVSC ,"unable to get net device..." "device being destroyed?" );
@@ -900,10 +903,10 @@ static void NetVscOnSendCompletion(struct hv_device *device, "%d received!!", nvsp_packet->Header.MessageType); } -PutNetDevice (device); +put_net_device (device); } -static int NetVscOnSend (struct hv_device *device, +static int netvsc_send (struct hv_device *device,struct hv_netvsc_packet *packet) {struct netvsc_device *net_device;
@@ -911,7 +914,7 @@ static int NetVscOnSend(struct hv_device *device,struct nvsp_message sendMessage; - net_device =GetOutboundNetDevice (device); + net_device =get_outbound_net_device (device);if (!net_device) {DPRINT_ERR (NETVSC ,"net device (%p) shutting down..." "ignoring outbound packets" , net_device);
@@ -952,11 +955,11 @@ static int NetVscOnSend(struct hv_device *device, packet, ret);atomic_inc (&net_device->NumOutstandingSends); -PutNetDevice (device); +put_net_device (device);return ret; } -static void NetVscOnReceive (struct hv_device *device, +static void netvsc_receive (struct hv_device *device,struct vmpacket_descriptor *packet) {struct netvsc_device *net_device;
@@ -972,7 +975,7 @@ static void NetVscOnReceive(struct hv_device *device,unsigned long flags;LIST_HEAD (listHead); - net_device =GetInboundNetDevice (device); + net_device =get_inbound_net_device (device);if (!net_device) {DPRINT_ERR (NETVSC ,"unable to get net device..." "device being destroyed?" );
@@ -986,7 +989,7 @@ static void NetVscOnReceive(struct hv_device *device,if (packet->Type != VmbusPacketTypeDataUsingTransferPages) {DPRINT_ERR (NETVSC ,"Unknown packet type received - %d" , packet->Type); -PutNetDevice (device); +put_net_device (device);return ; }
@@ -998,7 +1001,7 @@ static void NetVscOnReceive(struct hv_device *device, NvspMessage1TypeSendRNDISPacket) {DPRINT_ERR (NETVSC ,"Unknown nvsp packet type received - %d" , nvsp_packet->Header.MessageType); -PutNetDevice (device); +put_net_device (device);return ; }
@@ -1011,7 +1014,7 @@ static void NetVscOnReceive(struct hv_device *device,DPRINT_ERR (NETVSC ,"Invalid xfer page set id - " "expecting %x got %x" ,NETVSC_RECEIVE_BUFFER_ID , vmxferpage_packet->TransferPageSetId); -PutNetDevice (device); +put_net_device (device);return ; }
@@ -1051,10 +1054,10 @@ static void NetVscOnReceive(struct hv_device *device,spin_unlock_irqrestore (&net_device->receive_packet_list_lock, flags); -NetVscSendReceiveCompletion (device, +netvsc_send_recv_completion (device, vmxferpage_packet->d.TransactionId); -PutNetDevice (device); +put_net_device (device);return ; }
@@ -1081,7 +1084,7 @@ static void NetVscOnReceive(struct hv_device *device,/* Initialize the netvsc packet */ netvsc_packet->XferPagePacket = xferpage_packet; netvsc_packet->Completion.Recv.OnReceiveCompletion = - NetVscOnReceiveCompletion; + netvsc_receive_completion; netvsc_packet->Completion.Recv.ReceiveCompletionContext = netvsc_packet; netvsc_packet->Device = device;
@@ -1153,16 +1156,16 @@ static void NetVscOnReceive(struct hv_device *device, ((struct netvsc_driver *)device->Driver)->OnReceiveCallback (device, netvsc_packet); -NetVscOnReceiveCompletion (netvsc_packet-> +netvsc_receive_completion (netvsc_packet-> Completion.Recv.ReceiveCompletionContext); }/* ASSERT(list_empty(&listHead)); */ -PutNetDevice (device); +put_net_device (device); } -static void NetVscSendReceiveCompletion (struct hv_device *device, +static void netvsc_send_recv_completion (struct hv_device *device,u64 transaction_id) {struct nvsp_message recvcompMessage;
@@ -1207,7 +1210,7 @@ retry_send_cmplt: }/* Send a receive completion packet to RNDIS device (ie NetVsp) */ -static void NetVscOnReceiveCompletion (void *context) +static void netvsc_receive_completion (void *context) {struct hv_netvsc_packet *packet = context;struct hv_device *device = (struct hv_device *)packet->Device;
@@ -1223,7 +1226,7 @@ static void NetVscOnReceiveCompletion(void *context)* send out receive completion, we are using GetInboundNetDevice() * since we may have disable outbound traffic already. */ - net_device =GetInboundNetDevice (device); + net_device =get_inbound_net_device (device);if (!net_device) {DPRINT_ERR (NETVSC ,"unable to get net device..." "device being destroyed?" );
@@ -1254,12 +1257,12 @@ static void NetVscOnReceiveCompletion(void *context)/* Send a receive completion for the xfer page packet */ if (fsend_receive_comp) -NetVscSendReceiveCompletion (device, transaction_id); +netvsc_send_recv_completion (device, transaction_id); -PutNetDevice (device); +put_net_device (device); } -static void NetVscOnChannelCallback (void *context) +static void netvsc_channel_cb (void *context) {int ret;struct hv_device *device = context;
@@ -1279,7 +1282,7 @@ static void NetVscOnChannelCallback(void *context)return ; buffer = packet; - net_device =GetInboundNetDevice (device); + net_device =get_inbound_net_device (device);if (!net_device) {DPRINT_ERR (NETVSC ,"net device (%p) shutting down..." "ignoring inbound packets" , net_device);
@@ -1297,11 +1300,11 @@ static void NetVscOnChannelCallback(void *context) desc = (struct vmpacket_descriptor *)buffer;switch (desc->Type) {case VmbusPacketTypeCompletion: -NetVscOnSendCompletion (device, desc); +netvsc_send_completion (device, desc);break ;case VmbusPacketTypeDataUsingTransferPages: -NetVscOnReceive (device, desc); +netvsc_receive (device, desc);break ;default :
@@ -1344,7 +1347,7 @@ static void NetVscOnChannelCallback(void *context) } }while (1 ); -PutNetDevice (device); +put_net_device (device); out:kfree (buffer);return ;
drivers/staging/hv/netvsc_api.h +1 -1
@@ -109,7 +109,7 @@ struct netvsc_device_info { };/* Interface */ -int NetVscInitialize (struct hv_driver *drv); +int netvsc_initialize (struct hv_driver *drv);int RndisFilterOnOpen (struct hv_device *Device);int RndisFilterOnClose (struct hv_device *Device);
drivers/staging/hv/netvsc_drv.c +1 -1
@@ -539,7 +539,7 @@ static int __init netvsc_init(void)if (!dmi_check_system (hv_netvsc_dmi_table))return -ENODEV ; -return netvsc_drv_init (NetVscInitialize); +return netvsc_drv_init (netvsc_initialize); } static void __exit netvsc_exit(void)
Signature · 1 line
1.6.3.2
PATCH 3/7 staging: hv: Convert camel cased variables in rndis_filter.c to lower cases
--- drivers/staging/hv/rndis_filter.c | 582 +++++++++++++++++++------------------ 1 files changed, 296 insertions(+), 286 deletions(-)
drivers/staging/hv/rndis_filter.c +296 -286
@@ -32,7 +32,7 @@/* Data types */ struct rndis_filter_driver_object {/* The original driver */ -struct netvsc_driver InnerDriver; +struct netvsc_driver inner_drv; };enum rndis_device_state {
@@ -43,61 +43,61 @@ enum rndis_device_state { };struct rndis_device { -struct netvsc_device *NetDevice; +struct netvsc_device *net_dev; -enum rndis_device_state State; -u32 LinkStatus; -atomic_t NewRequestId; +enum rndis_device_state state; +u32 link_stat; +atomic_t new_req_id;spinlock_t request_lock; -struct list_head RequestList; +struct list_head req_list; -unsigned char HwMacAddr[ETH_ALEN ]; +unsigned char hw_mac_adr[ETH_ALEN ]; };struct rndis_request { -struct list_head ListEntry; -struct osd_waitevent *WaitEvent; +struct list_head list_ent; +struct osd_waitevent *waitevent;/* * FIXME: We assumed a fixed size response here. If we do ever need to * handle a bigger response, we can either define a max response * message or add a response buffer variable above this field */ -struct rndis_message ResponseMessage; +struct rndis_message response_msg;/* Simplify allocation by having a netvsc packet inline */ -struct hv_netvsc_packet Packet; -struct hv_page_buffer Buffer; +struct hv_netvsc_packet pkt; +struct hv_page_buffer buf;/* FIXME: We assumed a fixed size request here. */ -struct rndis_message RequestMessage; +struct rndis_message request_msg; };struct rndis_filter_packet { -void *CompletionContext; -void (*OnCompletion)(void *context); -struct rndis_message Message; +void *completion_ctx; +void (*completion)(void *context); +struct rndis_message msg; }; -static int RndisFilterOnDeviceAdd (struct hv_device *Device, -void *AdditionalInfo); +static int RndisFilterOnDeviceAdd (struct hv_device *dev, +void *additional_info); -static int RndisFilterOnDeviceRemove (struct hv_device *Device); +static int RndisFilterOnDeviceRemove (struct hv_device *dev); -static void RndisFilterOnCleanup (struct hv_driver *Driver); +static void RndisFilterOnCleanup (struct hv_driver *drv); -static int RndisFilterOnSend (struct hv_device *Device, -struct hv_netvsc_packet *Packet); +static int RndisFilterOnSend (struct hv_device *dev, +struct hv_netvsc_packet *pkt); -static void RndisFilterOnSendCompletion (void *Context); +static void RndisFilterOnSendCompletion (void *ctx); -static void RndisFilterOnSendRequestCompletion (void *Context); +static void RndisFilterOnSendRequestCompletion (void *ctx);/* The one and only */ -static struct rndis_filter_driver_object gRndisFilter; +static struct rndis_filter_driver_object rndis_filter;static struct rndis_device *GetRndisDevice (void ) {
@@ -109,19 +109,19 @@ static struct rndis_device *GetRndisDevice(void)spin_lock_init (&device->request_lock); -INIT_LIST_HEAD (&device->RequestList); +INIT_LIST_HEAD (&device->req_list); - device->State =RNDIS_DEV_UNINITIALIZED ; + device->state =RNDIS_DEV_UNINITIALIZED ;return device; } -static struct rndis_request *GetRndisRequest (struct rndis_device *Device, -u32 MessageType, -u32 MessageLength) +static struct rndis_request *GetRndisRequest (struct rndis_device *dev, +u32 msg_type, +u32 msg_len) {struct rndis_request *request; -struct rndis_message *rndisMessage; +struct rndis_message *rndis_msg;struct rndis_set_request *set;unsigned long flags;
@@ -129,61 +129,61 @@ static struct rndis_request *GetRndisRequest(struct rndis_device *Device,if (!request)return NULL ; - request->WaitEvent =osd_waitevent_create (); -if (!request->WaitEvent) { + request->waitevent =osd_waitevent_create (); +if (!request->waitevent) {kfree (request);return NULL ; } - rndisMessage = &request->RequestMessage; - rndisMessage->NdisMessageType = MessageType; - rndisMessage->MessageLength = MessageLength; + rndis_msg = &request->request_msg; + rndis_msg->NdisMessageType = msg_type; + rndis_msg->MessageLength = msg_len;/* * Set the request id. This field is always after the rndis header for * request/response packet types so we just used the SetRequest as a * template */ - set = &rndisMessage->Message.SetRequest; - set->RequestId =atomic_inc_return (&Device->NewRequestId); + set = &rndis_msg->Message.SetRequest; + set->RequestId =atomic_inc_return (&dev->new_req_id);/* Add to the request list */ -spin_lock_irqsave (&Device->request_lock, flags); -list_add_tail (&request->ListEntry, &Device->RequestList); -spin_unlock_irqrestore (&Device->request_lock, flags); +spin_lock_irqsave (&dev->request_lock, flags); +list_add_tail (&request->list_ent, &dev->req_list); +spin_unlock_irqrestore (&dev->request_lock, flags);return request; } -static void PutRndisRequest (struct rndis_device *Device, -struct rndis_request *Request) +static void PutRndisRequest (struct rndis_device *dev, +struct rndis_request *req) {unsigned long flags; -spin_lock_irqsave (&Device->request_lock, flags); -list_del (&Request->ListEntry); -spin_unlock_irqrestore (&Device->request_lock, flags); +spin_lock_irqsave (&dev->request_lock, flags); +list_del (&req->list_ent); +spin_unlock_irqrestore (&dev->request_lock, flags); -kfree (Request->WaitEvent); -kfree (Request); +kfree (req->waitevent); +kfree (req); } -static void DumpRndisMessage (struct rndis_message *RndisMessage) +static void DumpRndisMessage (struct rndis_message *rndis_msg) { -switch (RndisMessage->NdisMessageType) { +switch (rndis_msg->NdisMessageType) {case REMOTE_NDIS_PACKET_MSG :DPRINT_DBG (NETVSC ,"REMOTE_NDIS_PACKET_MSG (len %u, " "data offset %u data len %u, # oob %u, " "oob offset %u, oob len %u, pkt offset %u, " "pkt len %u" , - RndisMessage->MessageLength, - RndisMessage->Message.Packet.DataOffset, - RndisMessage->Message.Packet.DataLength, - RndisMessage->Message.Packet.NumOOBDataElements, - RndisMessage->Message.Packet.OOBDataOffset, - RndisMessage->Message.Packet.OOBDataLength, - RndisMessage->Message.Packet.PerPacketInfoOffset, - RndisMessage->Message.Packet.PerPacketInfoLength); + rndis_msg->MessageLength, + rndis_msg->Message.Packet.DataOffset, + rndis_msg->Message.Packet.DataLength, + rndis_msg->Message.Packet.NumOOBDataElements, + rndis_msg->Message.Packet.OOBDataOffset, + rndis_msg->Message.Packet.OOBDataLength, + rndis_msg->Message.Packet.PerPacketInfoOffset, + rndis_msg->Message.Packet.PerPacketInfoLength);break ;case REMOTE_NDIS_INITIALIZE_CMPLT :
@@ -191,147 +191,157 @@ static void DumpRndisMessage(struct rndis_message *RndisMessage)"(len %u, id 0x%x, status 0x%x, major %d, minor %d, " "device flags %d, max xfer size 0x%x, max pkts %u, " "pkt aligned %u)" , - RndisMessage->MessageLength, - RndisMessage->Message.InitializeComplete.RequestId, - RndisMessage->Message.InitializeComplete.Status, - RndisMessage->Message.InitializeComplete.MajorVersion, - RndisMessage->Message.InitializeComplete.MinorVersion, - RndisMessage->Message.InitializeComplete.DeviceFlags, - RndisMessage->Message.InitializeComplete.MaxTransferSize, - RndisMessage->Message.InitializeComplete.MaxPacketsPerMessage, - RndisMessage->Message.InitializeComplete.PacketAlignmentFactor); + rndis_msg->MessageLength, + rndis_msg->Message.InitializeComplete.RequestId, + rndis_msg->Message.InitializeComplete.Status, + rndis_msg->Message.InitializeComplete.MajorVersion, + rndis_msg->Message.InitializeComplete.MinorVersion, + rndis_msg->Message.InitializeComplete.DeviceFlags, + rndis_msg->Message.InitializeComplete.MaxTransferSize, + rndis_msg->Message.InitializeComplete. + MaxPacketsPerMessage, + rndis_msg->Message.InitializeComplete. + PacketAlignmentFactor);break ;case REMOTE_NDIS_QUERY_CMPLT :DPRINT_DBG (NETVSC ,"REMOTE_NDIS_QUERY_CMPLT " "(len %u, id 0x%x, status 0x%x, buf len %u, " "buf offset %u)" , - RndisMessage->MessageLength, - RndisMessage->Message.QueryComplete.RequestId, - RndisMessage->Message.QueryComplete.Status, - RndisMessage->Message.QueryComplete.InformationBufferLength, - RndisMessage->Message.QueryComplete.InformationBufferOffset); + rndis_msg->MessageLength, + rndis_msg->Message.QueryComplete.RequestId, + rndis_msg->Message.QueryComplete.Status, + rndis_msg->Message.QueryComplete. + InformationBufferLength, + rndis_msg->Message.QueryComplete. + InformationBufferOffset);break ;case REMOTE_NDIS_SET_CMPLT :DPRINT_DBG (NETVSC ,"REMOTE_NDIS_SET_CMPLT (len %u, id 0x%x, status 0x%x)" , - RndisMessage->MessageLength, - RndisMessage->Message.SetComplete.RequestId, - RndisMessage->Message.SetComplete.Status); + rndis_msg->MessageLength, + rndis_msg->Message.SetComplete.RequestId, + rndis_msg->Message.SetComplete.Status);break ;case REMOTE_NDIS_INDICATE_STATUS_MSG :DPRINT_DBG (NETVSC ,"REMOTE_NDIS_INDICATE_STATUS_MSG " "(len %u, status 0x%x, buf len %u, buf offset %u)" , - RndisMessage->MessageLength, - RndisMessage->Message.IndicateStatus.Status, - RndisMessage->Message.IndicateStatus.StatusBufferLength, - RndisMessage->Message.IndicateStatus.StatusBufferOffset); + rndis_msg->MessageLength, + rndis_msg->Message.IndicateStatus.Status, + rndis_msg->Message.IndicateStatus.StatusBufferLength, + rndis_msg->Message.IndicateStatus.StatusBufferOffset);break ;default :DPRINT_DBG (NETVSC ,"0x%x (len %u)" , - RndisMessage->NdisMessageType, - RndisMessage->MessageLength); + rndis_msg->NdisMessageType, + rndis_msg->MessageLength);break ; } } -static int RndisFilterSendRequest (struct rndis_device *Device, -struct rndis_request *Request) +static int RndisFilterSendRequest (struct rndis_device *dev, +struct rndis_request *req) {int ret;struct hv_netvsc_packet *packet;/* Setup the packet to send it */ - packet = &Request->Packet; + packet = &req->pkt; packet->IsDataPacket = false; - packet->TotalDataBufferLength = Request->RequestMessage.MessageLength; + packet->TotalDataBufferLength = req->request_msg.MessageLength; packet->PageBufferCount =1 ; - packet->PageBuffers[0 ].Pfn =virt_to_phys (&Request->RequestMessage) >> + packet->PageBuffers[0 ].Pfn =virt_to_phys (&req->request_msg) >>PAGE_SHIFT ; - packet->PageBuffers[0 ].Length = Request->RequestMessage.MessageLength; + packet->PageBuffers[0 ].Length = req->request_msg.MessageLength; packet->PageBuffers[0 ].Offset = - (unsigned long )&Request->RequestMessage & (PAGE_SIZE -1 ); + (unsigned long )&req->request_msg & (PAGE_SIZE -1 ); - packet->Completion.Send.SendCompletionContext = Request;/* packet; */ + packet->Completion.Send.SendCompletionContext = req;/* packet; */ packet->Completion.Send.OnSendCompletion = RndisFilterOnSendRequestCompletion; - packet->Completion.Send.SendCompletionTid = (unsigned long )Device; + packet->Completion.Send.SendCompletionTid = (unsigned long )dev; - ret = gRndisFilter.InnerDriver.OnSend (Device->NetDevice->Device, packet); + ret = rndis_filter.inner_drv.OnSend (dev->net_dev->Device, packet);return ret; } -static void RndisFilterReceiveResponse (struct rndis_device *Device, -struct rndis_message *Response) +static void RndisFilterReceiveResponse (struct rndis_device *dev, +struct rndis_message *resp) {struct rndis_request *request =NULL ;bool found = false;unsigned long flags; -spin_lock_irqsave (&Device->request_lock, flags); -list_for_each_entry (request, &Device->RequestList, ListEntry) { +spin_lock_irqsave (&dev->request_lock, flags); +list_for_each_entry (request, &dev->req_list, list_ent) {/* * All request/response message contains RequestId as the 1st * field */ -if (request->RequestMessage.Message.InitializeRequest.RequestId - == Response->Message.InitializeComplete.RequestId) { +if (request->request_msg.Message.InitializeRequest.RequestId + == resp->Message.InitializeComplete.RequestId) {DPRINT_DBG (NETVSC ,"found rndis request for " "this response (id 0x%x req type 0x%x res " "type 0x%x)" , - request->RequestMessage.Message.InitializeRequest.RequestId, - request->RequestMessage.NdisMessageType, - Response->NdisMessageType); + request->request_msg.Message. + InitializeRequest.RequestId, + request->request_msg.NdisMessageType, + resp->NdisMessageType); found = true;break ; } } -spin_unlock_irqrestore (&Device->request_lock, flags); +spin_unlock_irqrestore (&dev->request_lock, flags);if (found) { -if (Response->MessageLength <=sizeof (struct rndis_message )) { -memcpy (&request->ResponseMessage, Response, - Response->MessageLength); +if (resp->MessageLength <=sizeof (struct rndis_message )) { +memcpy (&request->response_msg, resp, + resp->MessageLength); }else {DPRINT_ERR (NETVSC ,"rndis response buffer overflow " "detected (size %u max %zu)" , - Response->MessageLength, + resp->MessageLength,sizeof (struct rndis_filter_packet )); -if (Response->NdisMessageType == +if (resp->NdisMessageType ==REMOTE_NDIS_RESET_CMPLT ) {/* does not have a request id field */ - request->ResponseMessage.Message.ResetComplete.Status =STATUS_BUFFER_OVERFLOW ; + request->response_msg.Message.ResetComplete. + Status =STATUS_BUFFER_OVERFLOW ; }else { - request->ResponseMessage.Message.InitializeComplete.Status =STATUS_BUFFER_OVERFLOW ; + request->response_msg.Message. + InitializeComplete.Status = +STATUS_BUFFER_OVERFLOW ; } } -osd_waitevent_set (request->WaitEvent); +osd_waitevent_set (request->waitevent); }else {DPRINT_ERR (NETVSC ,"no rndis request found for this response " "(id 0x%x res type 0x%x)" , - Response->Message.InitializeComplete.RequestId, - Response->NdisMessageType); + resp->Message.InitializeComplete.RequestId, + resp->NdisMessageType); } } -static void RndisFilterReceiveIndicateStatus (struct rndis_device *Device, -struct rndis_message *Response) +static void RndisFilterReceiveIndicateStatus (struct rndis_device *dev, +struct rndis_message *resp) {struct rndis_indicate_status *indicate = - &Response->Message.IndicateStatus; + &resp->Message.IndicateStatus;if (indicate->Status ==RNDIS_STATUS_MEDIA_CONNECT ) { - gRndisFilter.InnerDriver.OnLinkStatusChanged (Device->NetDevice->Device,1 ); + rndis_filter.inner_drv.OnLinkStatusChanged ( + dev->net_dev->Device,1 ); }else if (indicate->Status ==RNDIS_STATUS_MEDIA_DISCONNECT ) { - gRndisFilter.InnerDriver.OnLinkStatusChanged (Device->NetDevice->Device,0 ); + rndis_filter.inner_drv.OnLinkStatusChanged ( + dev->net_dev->Device,0 ); }else {/* * TODO:
@@ -339,18 +349,18 @@ static void RndisFilterReceiveIndicateStatus(struct rndis_device *Device, } } -static void RndisFilterReceiveData (struct rndis_device *Device, -struct rndis_message *Message, -struct hv_netvsc_packet *Packet) +static void RndisFilterReceiveData (struct rndis_device *dev, +struct rndis_message *msg, +struct hv_netvsc_packet *pkt) { -struct rndis_packet *rndisPacket; -u32 dataOffset; +struct rndis_packet *rndis_pkt; +u32 data_offset;/* empty ethernet frame ?? */ /* ASSERT(Packet->PageBuffers[0].Length > */ /* RNDIS_MESSAGE_SIZE(struct rndis_packet)); */ - rndisPacket = &Message->Message.Packet; + rndis_pkt = &msg->Message.Packet;/* * FIXME: Handle multiple rndis pkt msgs that maybe enclosed in this
@@ -358,48 +368,48 @@ static void RndisFilterReceiveData(struct rndis_device *Device,*/ /* Remove the rndis header and pass it back up the stack */ - dataOffset =RNDIS_HEADER_SIZE + rndisPacket->DataOffset; + data_offset =RNDIS_HEADER_SIZE + rndis_pkt->DataOffset; - Packet->TotalDataBufferLength -= dataOffset; - Packet->PageBuffers[0 ].Offset += dataOffset; - Packet->PageBuffers[0 ].Length -= dataOffset; + pkt->TotalDataBufferLength -= data_offset; + pkt->PageBuffers[0 ].Offset += data_offset; + pkt->PageBuffers[0 ].Length -= data_offset; - Packet->IsDataPacket = true; + pkt->IsDataPacket = true; - gRndisFilter.InnerDriver.OnReceiveCallback (Device->NetDevice->Device, - Packet); + rndis_filter.inner_drv.OnReceiveCallback (dev->net_dev->Device, + pkt); } -static int RndisFilterOnReceive (struct hv_device *Device, -struct hv_netvsc_packet *Packet) +static int RndisFilterOnReceive (struct hv_device *dev, +struct hv_netvsc_packet *pkt) { -struct netvsc_device *netDevice = Device->Extension; -struct rndis_device *rndisDevice; -struct rndis_message rndisMessage; -struct rndis_message *rndisHeader; +struct netvsc_device *net_dev = dev->Extension; +struct rndis_device *rndis_dev; +struct rndis_message rndis_msg; +struct rndis_message *rndis_hdr; -if (!netDevice) +if (!net_dev)return -EINVAL ;/* Make sure the rndis device state is initialized */ -if (!netDevice->Extension) { +if (!net_dev->Extension) {DPRINT_ERR (NETVSC ,"got rndis message but no rndis device..." "dropping this message!" );return -1 ; } - rndisDevice = (struct rndis_device *)netDevice->Extension; -if (rndisDevice->State ==RNDIS_DEV_UNINITIALIZED ) { + rndis_dev = (struct rndis_device *)net_dev->Extension; +if (rndis_dev->state ==RNDIS_DEV_UNINITIALIZED ) {DPRINT_ERR (NETVSC ,"got rndis message but rndis device " "uninitialized...dropping this message!" );return -1 ; } - rndisHeader = (struct rndis_message *)kmap_atomic ( -pfn_to_page (Packet->PageBuffers[0 ].Pfn),KM_IRQ0 ); + rndis_hdr = (struct rndis_message *)kmap_atomic ( +pfn_to_page (pkt->PageBuffers[0 ].Pfn),KM_IRQ0 ); - rndisHeader = (void *)((unsigned long )rndisHeader + - Packet->PageBuffers[0 ].Offset); + rndis_hdr = (void *)((unsigned long )rndis_hdr + + pkt->PageBuffers[0 ].Offset);/* Make sure we got a valid rndis message */ /*
@@ -408,39 +418,39 @@ static int RndisFilterOnReceive(struct hv_device *Device,* range shows 52 bytes * */ #if 0 -if (Packet->TotalDataBufferLength != rndisHeader->MessageLength) { -kunmap_atomic (rndisHeader - Packet->PageBuffers[0 ].Offset, +if (pkt->TotalDataBufferLength != rndis_hdr->MessageLength) { +kunmap_atomic (rndis_hdr - pkt->PageBuffers[0 ].Offset,KM_IRQ0 );DPRINT_ERR (NETVSC ,"invalid rndis message? (expected %u " "bytes got %u)...dropping this message!" , - rndisHeader->MessageLength, - Packet->TotalDataBufferLength); + rndis_hdr->MessageLength, + pkt->TotalDataBufferLength);return -1 ; }#endif -if ((rndisHeader->NdisMessageType !=REMOTE_NDIS_PACKET_MSG ) && - (rndisHeader->MessageLength >sizeof (struct rndis_message ))) { +if ((rndis_hdr->NdisMessageType !=REMOTE_NDIS_PACKET_MSG ) && + (rndis_hdr->MessageLength >sizeof (struct rndis_message ))) {DPRINT_ERR (NETVSC ,"incoming rndis message buffer overflow " "detected (got %u, max %zu)...marking it an error!" , - rndisHeader->MessageLength, + rndis_hdr->MessageLength,sizeof (struct rndis_message )); } -memcpy (&rndisMessage, rndisHeader, - (rndisHeader->MessageLength >sizeof (struct rndis_message )) ? +memcpy (&rndis_msg, rndis_hdr, + (rndis_hdr->MessageLength >sizeof (struct rndis_message )) ?sizeof (struct rndis_message ) : - rndisHeader->MessageLength); + rndis_hdr->MessageLength); -kunmap_atomic (rndisHeader - Packet->PageBuffers[0 ].Offset,KM_IRQ0 ); +kunmap_atomic (rndis_hdr - pkt->PageBuffers[0 ].Offset,KM_IRQ0 ); -DumpRndisMessage (&rndisMessage); +DumpRndisMessage (&rndis_msg); -switch (rndisMessage.NdisMessageType) { +switch (rndis_msg.NdisMessageType) {case REMOTE_NDIS_PACKET_MSG :/* data msg */ -RndisFilterReceiveData (rndisDevice, &rndisMessage, Packet); +RndisFilterReceiveData (rndis_dev, &rndis_msg, pkt);break ;case REMOTE_NDIS_INITIALIZE_CMPLT :
@@ -449,37 +459,37 @@ static int RndisFilterOnReceive(struct hv_device *Device,/* case REMOTE_NDIS_RESET_CMPLT: */ /* case REMOTE_NDIS_KEEPALIVE_CMPLT: */ /* completion msgs */ -RndisFilterReceiveResponse (rndisDevice, &rndisMessage); +RndisFilterReceiveResponse (rndis_dev, &rndis_msg);break ;case REMOTE_NDIS_INDICATE_STATUS_MSG :/* notification msgs */ -RndisFilterReceiveIndicateStatus (rndisDevice, &rndisMessage); +RndisFilterReceiveIndicateStatus (rndis_dev, &rndis_msg);break ;default :DPRINT_ERR (NETVSC ,"unhandled rndis message (type %u len %u)" , - rndisMessage.NdisMessageType, - rndisMessage.MessageLength); + rndis_msg.NdisMessageType, + rndis_msg.MessageLength);break ; }return 0 ; } -static int RndisFilterQueryDevice (struct rndis_device *Device,u32 Oid, -void *Result,u32 *ResultSize) +static int RndisFilterQueryDevice (struct rndis_device *dev,u32 oid, +void *result,u32 *result_size) {struct rndis_request *request; -u32 inresultSize = *ResultSize; +u32 inresult_size = *result_size;struct rndis_query_request *query; -struct rndis_query_complete *queryComplete; +struct rndis_query_complete *query_complete;int ret =0 ; -if (!Result) +if (!result)return -EINVAL ; - *ResultSize =0 ; - request =GetRndisRequest (Device,REMOTE_NDIS_QUERY_MSG , + *result_size =0 ; + request =GetRndisRequest (dev,REMOTE_NDIS_QUERY_MSG , RNDIS_MESSAGE_SIZE(struct rndis_query_request));if (!request) { ret =-1 ;
@@ -487,71 +497,71 @@ static int RndisFilterQueryDevice(struct rndis_device *Device, u32 Oid, }/* Setup the rndis query */ - query = &request->RequestMessage.Message.QueryRequest; - query->Oid = Oid; + query = &request->request_msg.Message.QueryRequest; + query->Oid = oid; query->InformationBufferOffset =sizeof (struct rndis_query_request ); query->InformationBufferLength =0 ; query->DeviceVcHandle =0 ; - ret =RndisFilterSendRequest (Device, request); + ret =RndisFilterSendRequest (dev, request);if (ret !=0 ) goto Cleanup; -osd_waitevent_wait (request->WaitEvent); +osd_waitevent_wait (request->waitevent);/* Copy the response back */ - queryComplete = &request->ResponseMessage.Message.QueryComplete; + query_complete = &request->response_msg.Message.QueryComplete; -if (queryComplete->InformationBufferLength > inresultSize) { +if (query_complete->InformationBufferLength > inresult_size) { ret =-1 ; goto Cleanup; } -memcpy (Result, - (void *)((unsigned long )queryComplete + - queryComplete->InformationBufferOffset), - queryComplete->InformationBufferLength); +memcpy (result, + (void *)((unsigned long )query_complete + + query_complete->InformationBufferOffset), + query_complete->InformationBufferLength); - *ResultSize = queryComplete->InformationBufferLength; + *result_size = query_complete->InformationBufferLength; Cleanup:if (request) -PutRndisRequest (Device, request); +PutRndisRequest (dev, request);return ret; } -static int RndisFilterQueryDeviceMac (struct rndis_device *Device) +static int RndisFilterQueryDeviceMac (struct rndis_device *dev) {u32 size =ETH_ALEN ; -return RndisFilterQueryDevice (Device, +return RndisFilterQueryDevice (dev,RNDIS_OID_802_3_PERMANENT_ADDRESS , - Device->HwMacAddr, &size); + dev->hw_mac_adr, &size); } -static int RndisFilterQueryDeviceLinkStatus (struct rndis_device *Device) +static int RndisFilterQueryDeviceLinkStatus (struct rndis_device *dev) {u32 size =sizeof (u32); -return RndisFilterQueryDevice (Device, +return RndisFilterQueryDevice (dev,RNDIS_OID_GEN_MEDIA_CONNECT_STATUS , - &Device->LinkStatus, &size); + &dev->link_stat, &size); } -static int RndisFilterSetPacketFilter (struct rndis_device *Device, -u32 NewFilter) +static int RndisFilterSetPacketFilter (struct rndis_device *dev, +u32 new_filter) {struct rndis_request *request;struct rndis_set_request *set; -struct rndis_set_complete *setComplete; +struct rndis_set_complete *set_complete;u32 status;int ret;/* ASSERT(RNDIS_MESSAGE_SIZE(struct rndis_set_request) + sizeof(u32) <= */ /* sizeof(struct rndis_message)); */ - request =GetRndisRequest (Device,REMOTE_NDIS_SET_MSG , + request =GetRndisRequest (dev,REMOTE_NDIS_SET_MSG , RNDIS_MESSAGE_SIZE(struct rndis_set_request) +sizeof (u32));if (!request) {
@@ -560,19 +570,19 @@ static int RndisFilterSetPacketFilter(struct rndis_device *Device, }/* Setup the rndis set */ - set = &request->RequestMessage.Message.SetRequest; + set = &request->request_msg.Message.SetRequest; set->Oid =RNDIS_OID_GEN_CURRENT_PACKET_FILTER ; set->InformationBufferLength =sizeof (u32); set->InformationBufferOffset =sizeof (struct rndis_set_request );memcpy ((void *)(unsigned long )set +sizeof (struct rndis_set_request ), - &NewFilter,sizeof (u32)); + &new_filter,sizeof (u32)); - ret =RndisFilterSendRequest (Device, request); + ret =RndisFilterSendRequest (dev, request);if (ret !=0 ) goto Cleanup; - ret =osd_waitevent_waitex (request->WaitEvent,2000 /*2sec*/ ); + ret =osd_waitevent_waitex (request->waitevent,2000 /*2sec*/ );if (!ret) { ret =-1 ;DPRINT_ERR (NETVSC ,"timeout before we got a set response..." );
@@ -584,27 +594,27 @@ static int RndisFilterSetPacketFilter(struct rndis_device *Device, }else {if (ret >0 ) ret =0 ; - setComplete = &request->ResponseMessage.Message.SetComplete; - status = setComplete->Status; + set_complete = &request->response_msg.Message.SetComplete; + status = set_complete->Status; } Cleanup:if (request) -PutRndisRequest (Device, request); +PutRndisRequest (dev, request); Exit:return ret; } -int RndisFilterInit (struct netvsc_driver *Driver) +int RndisFilterInit (struct netvsc_driver *drv) {DPRINT_DBG (NETVSC ,"sizeof(struct rndis_filter_packet) == %zd" ,sizeof (struct rndis_filter_packet )); - Driver->RequestExtSize =sizeof (struct rndis_filter_packet ); + drv->RequestExtSize =sizeof (struct rndis_filter_packet );/* Driver->Context = rndisDriver; */ -memset (&gRndisFilter,0 ,sizeof (struct rndis_filter_driver_object )); +memset (&rndis_filter,0 ,sizeof (struct rndis_filter_driver_object ));/*rndisDriver->Driver = Driver;
@@ -612,38 +622,38 @@ int RndisFilterInit(struct netvsc_driver *Driver)rndisDriver->OnLinkStatusChanged = Driver->OnLinkStatusChanged;*/ /* Save the original dispatch handlers before we override it */ - gRndisFilter.InnerDriver.Base.OnDeviceAdd = Driver->Base.OnDeviceAdd; - gRndisFilter.InnerDriver.Base.OnDeviceRemove = - Driver->Base.OnDeviceRemove; - gRndisFilter.InnerDriver.Base.OnCleanup = Driver->Base.OnCleanup; + rndis_filter.inner_drv.Base.OnDeviceAdd = drv->Base.OnDeviceAdd; + rndis_filter.inner_drv.Base.OnDeviceRemove = + drv->Base.OnDeviceRemove; + rndis_filter.inner_drv.Base.OnCleanup = drv->Base.OnCleanup;/* ASSERT(Driver->OnSend); */ /* ASSERT(Driver->OnReceiveCallback); */ - gRndisFilter.InnerDriver.OnSend = Driver->OnSend; - gRndisFilter.InnerDriver.OnReceiveCallback = Driver->OnReceiveCallback; - gRndisFilter.InnerDriver.OnLinkStatusChanged = - Driver->OnLinkStatusChanged; + rndis_filter.inner_drv.OnSend = drv->OnSend; + rndis_filter.inner_drv.OnReceiveCallback = drv->OnReceiveCallback; + rndis_filter.inner_drv.OnLinkStatusChanged = + drv->OnLinkStatusChanged;/* Override */ - Driver->Base.OnDeviceAdd = RndisFilterOnDeviceAdd; - Driver->Base.OnDeviceRemove = RndisFilterOnDeviceRemove; - Driver->Base.OnCleanup = RndisFilterOnCleanup; - Driver->OnSend = RndisFilterOnSend; + drv->Base.OnDeviceAdd = RndisFilterOnDeviceAdd; + drv->Base.OnDeviceRemove = RndisFilterOnDeviceRemove; + drv->Base.OnCleanup = RndisFilterOnCleanup; + drv->OnSend = RndisFilterOnSend;/* Driver->QueryLinkStatus = RndisFilterQueryDeviceLinkStatus; */ - Driver->OnReceiveCallback = RndisFilterOnReceive; + drv->OnReceiveCallback = RndisFilterOnReceive;return 0 ; } -static int RndisFilterInitDevice (struct rndis_device *Device) +static int RndisFilterInitDevice (struct rndis_device *dev) {struct rndis_request *request;struct rndis_initialize_request *init; -struct rndis_initialize_complete *initComplete; +struct rndis_initialize_complete *init_complete;u32 status;int ret; - request =GetRndisRequest (Device,REMOTE_NDIS_INITIALIZE_MSG , + request =GetRndisRequest (dev,REMOTE_NDIS_INITIALIZE_MSG , RNDIS_MESSAGE_SIZE(struct rndis_initialize_request));if (!request) { ret =-1 ;
@@ -651,103 +661,103 @@ static int RndisFilterInitDevice(struct rndis_device *Device) }/* Setup the rndis set */ - init = &request->RequestMessage.Message.InitializeRequest; + init = &request->request_msg.Message.InitializeRequest; init->MajorVersion =RNDIS_MAJOR_VERSION ; init->MinorVersion =RNDIS_MINOR_VERSION ;/* FIXME: Use 1536 - rounded ethernet frame size */ init->MaxTransferSize =2048 ; - Device->State =RNDIS_DEV_INITIALIZING ; + dev->state =RNDIS_DEV_INITIALIZING ; - ret =RndisFilterSendRequest (Device, request); + ret =RndisFilterSendRequest (dev, request);if (ret !=0 ) { - Device->State =RNDIS_DEV_UNINITIALIZED ; + dev->state =RNDIS_DEV_UNINITIALIZED ; goto Cleanup; } -osd_waitevent_wait (request->WaitEvent); +osd_waitevent_wait (request->waitevent); - initComplete = &request->ResponseMessage.Message.InitializeComplete; - status = initComplete->Status; + init_complete = &request->response_msg.Message.InitializeComplete; + status = init_complete->Status;if (status ==RNDIS_STATUS_SUCCESS ) { - Device->State =RNDIS_DEV_INITIALIZED ; + dev->state =RNDIS_DEV_INITIALIZED ; ret =0 ; }else { - Device->State =RNDIS_DEV_UNINITIALIZED ; + dev->state =RNDIS_DEV_UNINITIALIZED ; ret =-1 ; } Cleanup:if (request) -PutRndisRequest (Device, request); +PutRndisRequest (dev, request);return ret; } -static void RndisFilterHaltDevice (struct rndis_device *Device) +static void RndisFilterHaltDevice (struct rndis_device *dev) {struct rndis_request *request;struct rndis_halt_request *halt;/* Attempt to do a rndis device halt */ - request =GetRndisRequest (Device,REMOTE_NDIS_HALT_MSG , + request =GetRndisRequest (dev,REMOTE_NDIS_HALT_MSG , RNDIS_MESSAGE_SIZE(struct rndis_halt_request));if (!request) goto Cleanup;/* Setup the rndis set */ - halt = &request->RequestMessage.Message.HaltRequest; - halt->RequestId =atomic_inc_return (&Device->NewRequestId); + halt = &request->request_msg.Message.HaltRequest; + halt->RequestId =atomic_inc_return (&dev->new_req_id);/* Ignore return since this msg is optional. */ -RndisFilterSendRequest (Device, request); +RndisFilterSendRequest (dev, request); - Device->State =RNDIS_DEV_UNINITIALIZED ; + dev->state =RNDIS_DEV_UNINITIALIZED ; Cleanup:if (request) -PutRndisRequest (Device, request); +PutRndisRequest (dev, request);return ; } -static int RndisFilterOpenDevice (struct rndis_device *Device) +static int RndisFilterOpenDevice (struct rndis_device *dev) {int ret; -if (Device->State !=RNDIS_DEV_INITIALIZED ) +if (dev->state !=RNDIS_DEV_INITIALIZED )return 0 ; - ret =RndisFilterSetPacketFilter (Device, + ret =RndisFilterSetPacketFilter (dev,NDIS_PACKET_TYPE_BROADCAST |NDIS_PACKET_TYPE_ALL_MULTICAST |NDIS_PACKET_TYPE_DIRECTED );if (ret ==0 ) - Device->State =RNDIS_DEV_DATAINITIALIZED ; + dev->state =RNDIS_DEV_DATAINITIALIZED ;return ret; } -static int RndisFilterCloseDevice (struct rndis_device *Device) +static int RndisFilterCloseDevice (struct rndis_device *dev) {int ret; -if (Device->State !=RNDIS_DEV_DATAINITIALIZED ) +if (dev->state !=RNDIS_DEV_DATAINITIALIZED )return 0 ; - ret =RndisFilterSetPacketFilter (Device,0 ); + ret =RndisFilterSetPacketFilter (dev,0 );if (ret ==0 ) - Device->State =RNDIS_DEV_INITIALIZED ; + dev->state =RNDIS_DEV_INITIALIZED ;return ret; } -static int RndisFilterOnDeviceAdd (struct hv_device *Device, -void *AdditionalInfo) +static int RndisFilterOnDeviceAdd (struct hv_device *dev, +void *additional_info) {int ret;struct netvsc_device *netDevice;struct rndis_device *rndisDevice; -struct netvsc_device_info *deviceInfo = AdditionalInfo; +struct netvsc_device_info *deviceInfo = additional_info; rndisDevice =GetRndisDevice ();if (!rndisDevice)
@@ -760,7 +770,7 @@ static int RndisFilterOnDeviceAdd(struct hv_device *Device,* NOTE! Once the channel is created, we may get a receive callback * (RndisFilterOnReceive()) before this call is completed */ - ret = gRndisFilter.InnerDriver.Base.OnDeviceAdd (Device, AdditionalInfo); + ret = rndis_filter.inner_drv.Base.OnDeviceAdd (dev, additional_info);if (ret !=0 ) {kfree (rndisDevice);return ret;
@@ -768,12 +778,12 @@ static int RndisFilterOnDeviceAdd(struct hv_device *Device,/* Initialize the rndis device */ - netDevice = Device->Extension; + netDevice = dev->Extension;/* ASSERT(netDevice); */ /* ASSERT(netDevice->Device); */ netDevice->Extension = rndisDevice; - rndisDevice->NetDevice = netDevice; + rndisDevice->net_dev = netDevice;/* Send the rndis initialization message */ ret =RndisFilterInitDevice (rndisDevice);
@@ -793,43 +803,43 @@ static int RndisFilterOnDeviceAdd(struct hv_device *Device, }DPRINT_INFO (NETVSC ,"Device 0x%p mac addr %pM" , - rndisDevice, rndisDevice->HwMacAddr); + rndisDevice, rndisDevice->hw_mac_adr); -memcpy (deviceInfo->MacAddr, rndisDevice->HwMacAddr,ETH_ALEN ); +memcpy (deviceInfo->MacAddr, rndisDevice->hw_mac_adr,ETH_ALEN );RndisFilterQueryDeviceLinkStatus (rndisDevice); - deviceInfo->LinkState = rndisDevice->LinkStatus; + deviceInfo->LinkState = rndisDevice->link_stat;DPRINT_INFO (NETVSC ,"Device 0x%p link state %s" , rndisDevice, ((deviceInfo->LinkState) ? ("down" ) : ("up" )));return ret; } -static int RndisFilterOnDeviceRemove (struct hv_device *Device) +static int RndisFilterOnDeviceRemove (struct hv_device *dev) { -struct netvsc_device *netDevice = Device->Extension; -struct rndis_device *rndisDevice = netDevice->Extension; +struct netvsc_device *net_dev = dev->Extension; +struct rndis_device *rndis_dev = net_dev->Extension;/* Halt and release the rndis device */ -RndisFilterHaltDevice (rndisDevice); +RndisFilterHaltDevice (rndis_dev); -kfree (rndisDevice); - netDevice->Extension =NULL ; +kfree (rndis_dev); + net_dev->Extension =NULL ;/* Pass control to inner driver to remove the device */ - gRndisFilter.InnerDriver.Base.OnDeviceRemove (Device); + rndis_filter.inner_drv.Base.OnDeviceRemove (dev);return 0 ; } -static void RndisFilterOnCleanup (struct hv_driver *Driver) +static void RndisFilterOnCleanup (struct hv_driver *drv) { } -int RndisFilterOnOpen (struct hv_device *Device) +int RndisFilterOnOpen (struct hv_device *dev) { -struct netvsc_device *netDevice = Device->Extension; +struct netvsc_device *netDevice = dev->Extension;if (!netDevice)return -EINVAL ;
@@ -837,9 +847,9 @@ int RndisFilterOnOpen(struct hv_device *Device)return RndisFilterOpenDevice (netDevice->Extension); } -int RndisFilterOnClose (struct hv_device *Device) +int RndisFilterOnClose (struct hv_device *dev) { -struct netvsc_device *netDevice = Device->Extension; +struct netvsc_device *netDevice = dev->Extension;if (!netDevice)return -EINVAL ;
@@ -847,8 +857,8 @@ int RndisFilterOnClose(struct hv_device *Device)return RndisFilterCloseDevice (netDevice->Extension); } -static int RndisFilterOnSend (struct hv_device *Device, -struct hv_netvsc_packet *Packet) +static int RndisFilterOnSend (struct hv_device *dev, +struct hv_netvsc_packet *pkt) {int ret;struct rndis_filter_packet *filterPacket;
@@ -857,62 +867,62 @@ static int RndisFilterOnSend(struct hv_device *Device,u32 rndisMessageSize;/* Add the rndis header */ - filterPacket = (struct rndis_filter_packet *)Packet->Extension; + filterPacket = (struct rndis_filter_packet *)pkt->Extension;/* ASSERT(filterPacket); */ memset (filterPacket,0 ,sizeof (struct rndis_filter_packet )); - rndisMessage = &filterPacket->Message; + rndisMessage = &filterPacket->msg; rndisMessageSize = RNDIS_MESSAGE_SIZE(struct rndis_packet); rndisMessage->NdisMessageType =REMOTE_NDIS_PACKET_MSG ; - rndisMessage->MessageLength = Packet->TotalDataBufferLength + + rndisMessage->MessageLength = pkt->TotalDataBufferLength + rndisMessageSize; rndisPacket = &rndisMessage->Message.Packet; rndisPacket->DataOffset =sizeof (struct rndis_packet ); - rndisPacket->DataLength = Packet->TotalDataBufferLength; + rndisPacket->DataLength = pkt->TotalDataBufferLength; - Packet->IsDataPacket = true; - Packet->PageBuffers[0 ].Pfn =virt_to_phys (rndisMessage) >>PAGE_SHIFT ; - Packet->PageBuffers[0 ].Offset = + pkt->IsDataPacket = true; + pkt->PageBuffers[0 ].Pfn =virt_to_phys (rndisMessage) >>PAGE_SHIFT ; + pkt->PageBuffers[0 ].Offset = (unsigned long )rndisMessage & (PAGE_SIZE -1 ); - Packet->PageBuffers[0 ].Length = rndisMessageSize; + pkt->PageBuffers[0 ].Length = rndisMessageSize;/* Save the packet send completion and context */ - filterPacket->OnCompletion = Packet->Completion.Send.OnSendCompletion; - filterPacket->CompletionContext = - Packet->Completion.Send.SendCompletionContext; + filterPacket->completion = pkt->Completion.Send.OnSendCompletion; + filterPacket->completion_ctx = + pkt->Completion.Send.SendCompletionContext;/* Use ours */ - Packet->Completion.Send.OnSendCompletion = RndisFilterOnSendCompletion; - Packet->Completion.Send.SendCompletionContext = filterPacket; + pkt->Completion.Send.OnSendCompletion = RndisFilterOnSendCompletion; + pkt->Completion.Send.SendCompletionContext = filterPacket; - ret = gRndisFilter.InnerDriver.OnSend (Device, Packet); + ret = rndis_filter.inner_drv.OnSend (dev, pkt);if (ret !=0 ) {/* * Reset the completion to originals to allow retries from * above */ - Packet->Completion.Send.OnSendCompletion = - filterPacket->OnCompletion; - Packet->Completion.Send.SendCompletionContext = - filterPacket->CompletionContext; + pkt->Completion.Send.OnSendCompletion = + filterPacket->completion; + pkt->Completion.Send.SendCompletionContext = + filterPacket->completion_ctx; }return ret; } -static void RndisFilterOnSendCompletion (void *Context) +static void RndisFilterOnSendCompletion (void *ctx) { -struct rndis_filter_packet *filterPacket = Context; +struct rndis_filter_packet *filterPacket = ctx;/* Pass it back to the original handler */ - filterPacket->OnCompletion (filterPacket->CompletionContext); + filterPacket->completion (filterPacket->completion_ctx); } -static void RndisFilterOnSendRequestCompletion (void *Context) +static void RndisFilterOnSendRequestCompletion (void *ctx) {/* Noop */ }
Signature · 1 line
1.6.3.2
PATCH 4/7 staging: hv: Convert camel cased functions in rndis_filter.c to lower cases
--- drivers/staging/hv/netvsc.c | 2 +- drivers/staging/hv/netvsc_api.h | 4 +- drivers/staging/hv/netvsc_drv.c | 4 +- drivers/staging/hv/rndis_filter.c | 132 ++++++++++++++++++------------------ drivers/staging/hv/rndis_filter.h | 2 +- 5 files changed, 72 insertions(+), 72 deletions(-)
drivers/staging/hv/netvsc.c +1 -1
@@ -202,7 +202,7 @@ int netvsc_initialize(struct hv_driver *drv) driver->OnSend = netvsc_send; -RndisFilterInit (driver); +rndis_filter_init (driver);return 0 ; }
drivers/staging/hv/netvsc_api.h +2 -2
@@ -110,7 +110,7 @@ struct netvsc_device_info {/* Interface */ int netvsc_initialize (struct hv_driver *drv); -int RndisFilterOnOpen (struct hv_device *Device); -int RndisFilterOnClose (struct hv_device *Device); +int rndis_filter_open (struct hv_device *dev); +int rndis_filter_close (struct hv_device *dev);#endif /* _NETVSC_API_H_ */
drivers/staging/hv/netvsc_drv.c +2 -2
@@ -81,7 +81,7 @@ static int netvsc_open(struct net_device *net)if (netif_carrier_ok (net)) {/* Open up the device */ - ret =RndisFilterOnOpen (device_obj); + ret =rndis_filter_open (device_obj);if (ret !=0 ) {DPRINT_ERR (NETVSC_DRV ,"unable to open device (ret %d)." , ret);
@@ -104,7 +104,7 @@ static int netvsc_close(struct net_device *net)netif_stop_queue (net); - ret =RndisFilterOnClose (device_obj); + ret =rndis_filter_close (device_obj);if (ret !=0 )DPRINT_ERR (NETVSC_DRV ,"unable to close device (ret %d)." , ret);
drivers/staging/hv/rndis_filter.c +66 -66
442 lines not on this page · raw message
drivers/staging/hv/rndis_filter.h +1 -1
@@ -50,6 +50,6 @@/* Interface */ -extern int RndisFilterInit (struct netvsc_driver *driver); +extern int rndis_filter_init (struct netvsc_driver *driver);#endif /* _RNDISFILTER_H_ */
Signature · 1 line
1.6.3.2
PATCH 5/7 staging: hv: Convert camel cased struct fields in netvsc_api.h to lower cases
--- drivers/staging/hv/netvsc.c | 104 +++++++++++++++++----------------- drivers/staging/hv/netvsc_api.h | 58 ++++++++++---------- drivers/staging/hv/netvsc_drv.c | 74 ++++++++++++------------ drivers/staging/hv/rndis_filter.c | 112 ++++++++++++++++++------------------ 4 files changed, 174 insertions(+), 174 deletions(-)
drivers/staging/hv/netvsc.c +52 -52
@@ -196,11 +196,11 @@ int netvsc_initialize(struct hv_driver *drv)/* ASSERT(driver->OnLinkStatusChanged); */ /* Setup the dispatch table */ - driver->Base.OnDeviceAdd = netvsc_device_add; - driver->Base.OnDeviceRemove = netvsc_device_remove; - driver->Base.OnCleanup = netvsc_cleanup; + driver->base.OnDeviceAdd = netvsc_device_add; + driver->base.OnDeviceRemove = netvsc_device_remove; + driver->base.OnCleanup = netvsc_cleanup; - driver->OnSend = netvsc_send; + driver->send = netvsc_send;rndis_filter_init (driver);return 0 ;
@@ -736,7 +736,7 @@ static int netvsc_device_add(struct hv_device *device, void *additional_info) NETVSC_RECEIVE_PACKETLIST_COUNT, i);break ; } -list_add_tail (&packet->ListEntry, +list_add_tail (&packet->list_ent, &net_device->ReceivePacketList); } net_device->ChannelInitEvent =osd_waitevent_create ();
@@ -746,8 +746,8 @@ static int netvsc_device_add(struct hv_device *device, void *additional_info) }/* Open the channel */ - ret =vmbus_open (device->channel, net_driver->RingBufferSize, - net_driver->RingBufferSize,NULL ,0 , + ret =vmbus_open (device->channel, net_driver->ring_buf_size, + net_driver->ring_buf_size,NULL ,0 , netvsc_channel_cb, device);if (ret !=0 ) {
@@ -783,8 +783,8 @@ Cleanup:list_for_each_entry_safe (packet, pos, &net_device->ReceivePacketList, - ListEntry) { -list_del (&packet->ListEntry); + list_ent) { +list_del (&packet->list_ent);kfree (packet); }
@@ -840,8 +840,8 @@ static int netvsc_device_remove(struct hv_device *device)/* Release all resources */ list_for_each_entry_safe (netvsc_packet, pos, - &net_device->ReceivePacketList, ListEntry) { -list_del (&netvsc_packet->ListEntry); + &net_device->ReceivePacketList, list_ent) { +list_del (&netvsc_packet->list_ent);kfree (netvsc_packet); }
@@ -894,8 +894,8 @@ static void netvsc_send_completion(struct hv_device *device,/* ASSERT(nvscPacket); */ /* Notify the layer above us */ - nvsc_packet->Completion.Send.OnSendCompletion ( - nvsc_packet->Completion.Send.SendCompletionContext); + nvsc_packet->completion.send.send_completion ( + nvsc_packet->completion.send.send_completion_ctx);atomic_dec (&net_device->NumOutstandingSends); }else {
@@ -922,7 +922,7 @@ static int netvsc_send(struct hv_device *device, } sendMessage.Header.MessageType = NvspMessage1TypeSendRNDISPacket; -if (packet->IsDataPacket) { +if (packet->is_data_pkt) {/* 0 is RMC_DATA; */ sendMessage.Messages.Version1Messages.SendRNDISPacket.ChannelType =0 ; }else {
@@ -934,10 +934,10 @@ static int netvsc_send(struct hv_device *device, sendMessage.Messages.Version1Messages.SendRNDISPacket.SendBufferSectionIndex =0xFFFFFFFF ; sendMessage.Messages.Version1Messages.SendRNDISPacket.SendBufferSectionSize =0 ; -if (packet->PageBufferCount) { +if (packet->page_buf_cnt) { ret =vmbus_sendpacket_pagebuffer (device->channel, - packet->PageBuffers, - packet->PageBufferCount, + packet->page_buf, + packet->page_buf_cnt, &sendMessage,sizeof (struct nvsp_message ), (unsigned long )packet);
@@ -1063,82 +1063,82 @@ static void netvsc_receive(struct hv_device *device,/* Remove the 1st packet to represent the xfer page packet itself */ xferpage_packet = (struct xferpage_packet *)listHead.next; -list_del (&xferpage_packet->ListEntry); +list_del (&xferpage_packet->list_ent);/* This is how much we can satisfy */ - xferpage_packet->Count = count -1 ; + xferpage_packet->count = count -1 ;/* ASSERT(xferpagePacket->Count > 0 && xferpagePacket->Count <= */ /* vmxferpagePacket->RangeCount); */ -if (xferpage_packet->Count != vmxferpage_packet->RangeCount) { +if (xferpage_packet->count != vmxferpage_packet->RangeCount) {DPRINT_INFO (NETVSC ,"Needed %d netvsc pkts to satisy this xfer " "page...got %d" , vmxferpage_packet->RangeCount, - xferpage_packet->Count); + xferpage_packet->count); }/* Each range represents 1 RNDIS pkt that contains 1 ethernet frame */ for (i =0 ; i < (count -1 ); i++) { netvsc_packet = (struct hv_netvsc_packet *)listHead.next; -list_del (&netvsc_packet->ListEntry); +list_del (&netvsc_packet->list_ent);/* Initialize the netvsc packet */ - netvsc_packet->XferPagePacket = xferpage_packet; - netvsc_packet->Completion.Recv.OnReceiveCompletion = + netvsc_packet->xfer_page_pkt = xferpage_packet; + netvsc_packet->completion.recv.recv_completion = netvsc_receive_completion; - netvsc_packet->Completion.Recv.ReceiveCompletionContext = + netvsc_packet->completion.recv.recv_completion_ctx = netvsc_packet; - netvsc_packet->Device = device; + netvsc_packet->device = device;/* Save this so that we can send it back */ - netvsc_packet->Completion.Recv.ReceiveCompletionTid = + netvsc_packet->completion.recv.recv_completion_tid = vmxferpage_packet->d.TransactionId; - netvsc_packet->TotalDataBufferLength = + netvsc_packet->total_data_buflen = vmxferpage_packet->Ranges[i].ByteCount; - netvsc_packet->PageBufferCount =1 ; + netvsc_packet->page_buf_cnt =1 ;/* ASSERT(vmxferpagePacket->Ranges[i].ByteOffset + */ /* vmxferpagePacket->Ranges[i].ByteCount < */ /* netDevice->ReceiveBufferSize); */ - netvsc_packet->PageBuffers[0 ].Length = + netvsc_packet->page_buf[0 ].Length = vmxferpage_packet->Ranges[i].ByteCount; start =virt_to_phys ((void *)((unsigned long )net_device-> ReceiveBuffer + vmxferpage_packet->Ranges[i].ByteOffset)); - netvsc_packet->PageBuffers[0 ].Pfn = start >>PAGE_SHIFT ; + netvsc_packet->page_buf[0 ].Pfn = start >>PAGE_SHIFT ; end_virtual = (unsigned long )net_device->ReceiveBuffer + vmxferpage_packet->Ranges[i].ByteOffset + vmxferpage_packet->Ranges[i].ByteCount -1 ; end =virt_to_phys ((void *)end_virtual);/* Calculate the page relative offset */ - netvsc_packet->PageBuffers[0 ].Offset = + netvsc_packet->page_buf[0 ].Offset = vmxferpage_packet->Ranges[i].ByteOffset & (PAGE_SIZE -1 );if ((end >>PAGE_SHIFT ) != (start >>PAGE_SHIFT )) {/* Handle frame across multiple pages: */ - netvsc_packet->PageBuffers[0 ].Length = - (netvsc_packet->PageBuffers[0 ].Pfn << + netvsc_packet->page_buf[0 ].Length = + (netvsc_packet->page_buf[0 ].Pfn <<PAGE_SHIFT ) +PAGE_SIZE - start; - bytes_remain = netvsc_packet->TotalDataBufferLength - - netvsc_packet->PageBuffers[0 ].Length; + bytes_remain = netvsc_packet->total_data_buflen - + netvsc_packet->page_buf[0 ].Length;for (j =1 ; j <NETVSC_PACKET_MAXPAGE ; j++) { - netvsc_packet->PageBuffers[j].Offset =0 ; + netvsc_packet->page_buf[j].Offset =0 ;if (bytes_remain <=PAGE_SIZE ) { - netvsc_packet->PageBuffers[j].Length = + netvsc_packet->page_buf[j].Length = bytes_remain; bytes_remain =0 ; }else { - netvsc_packet->PageBuffers[j].Length = + netvsc_packet->page_buf[j].Length =PAGE_SIZE ; bytes_remain -=PAGE_SIZE ; } - netvsc_packet->PageBuffers[j].Pfn = + netvsc_packet->page_buf[j].Pfn =virt_to_phys ((void *)(end_virtual - bytes_remain)) >>PAGE_SHIFT ; - netvsc_packet->PageBufferCount++; + netvsc_packet->page_buf_cnt++;if (bytes_remain ==0 )break ; }
@@ -1148,16 +1148,16 @@ static void netvsc_receive(struct hv_device *device,"(pfn %llx, offset %u, len %u)" , i, vmxferpage_packet->Ranges[i].ByteOffset, vmxferpage_packet->Ranges[i].ByteCount, - netvsc_packet->PageBuffers[0 ].Pfn, - netvsc_packet->PageBuffers[0 ].Offset, - netvsc_packet->PageBuffers[0].Length); + netvsc_packet->page_buf[0 ].Pfn, + netvsc_packet->page_buf[0 ].Offset, + netvsc_packet->page_buf[0].Length);/* Pass it to the upper layer */ ((struct netvsc_driver *)device->Driver)-> -OnReceiveCallback (device, netvsc_packet); +recv_cb (device, netvsc_packet);netvsc_receive_completion (netvsc_packet-> - Completion.Recv.ReceiveCompletionContext); + completion.recv.recv_completion_ctx); }/* ASSERT(list_empty(&listHead)); */
@@ -1213,7 +1213,7 @@ retry_send_cmplt:static void netvsc_receive_completion (void *context) {struct hv_netvsc_packet *packet = context; -struct hv_device *device = (struct hv_device *)packet->Device; +struct hv_device *device = (struct hv_device *)packet->device;struct netvsc_device *net_device;u64 transaction_id =0 ;bool fsend_receive_comp = false;
@@ -1237,22 +1237,22 @@ static void netvsc_receive_completion(void *context)spin_lock_irqsave (&net_device->receive_packet_list_lock, flags);/* ASSERT(packet->XferPagePacket->Count > 0); */ - packet->XferPagePacket->Count--; + packet->xfer_page_pkt->count--;/* * Last one in the line that represent 1 xfer page packet. * Return the xfer page packet itself to the freelist */ -if (packet->XferPagePacket->Count ==0 ) { +if (packet->xfer_page_pkt->count ==0 ) { fsend_receive_comp = true; - transaction_id = packet->Completion.Recv.ReceiveCompletionTid; -list_add_tail (&packet->XferPagePacket->ListEntry, + transaction_id = packet->completion.recv.recv_completion_tid; +list_add_tail (&packet->xfer_page_pkt->list_ent, &net_device->ReceivePacketList); }/* Put the packet back */ -list_add_tail (&packet->ListEntry, &net_device->ReceivePacketList); +list_add_tail (&packet->list_ent, &net_device->ReceivePacketList);spin_unlock_irqrestore (&net_device->receive_packet_list_lock, flags);/* Send a receive completion for the xfer page packet */
drivers/staging/hv/netvsc_api.h +29 -29
104 lines not on this page · raw message
drivers/staging/hv/netvsc_drv.c +37 -37
183 lines not on this page · raw message
drivers/staging/hv/rndis_filter.c +56 -56
235 lines not on this page · raw message
Signature · 1 line
1.6.3.2
PATCH 6/7 staging: hv: Convert camel cased struct fields in netvsc.h to lower cases
--- drivers/staging/hv/netvsc.c | 340 +++++++++++++++++++------------------ drivers/staging/hv/netvsc.h | 164 +++++++++--------- drivers/staging/hv/netvsc_api.h | 2 +- drivers/staging/hv/rndis_filter.c | 22 ++-- 4 files changed, 265 insertions(+), 263 deletions(-)
drivers/staging/hv/netvsc.c +171 -169
@@ -83,9 +83,9 @@ static struct netvsc_device *alloc_net_device(struct hv_device *device)return NULL ;/* Set to 2 to allow both inbound and outbound traffic */ -atomic_cmpxchg (&net_device->RefCount,0 ,2 ); +atomic_cmpxchg (&net_device->refcnt,0 ,2 ); - net_device->Device = device; + net_device->dev = device; device->Extension = net_device;return net_device;
@@ -93,8 +93,8 @@ static struct netvsc_device *alloc_net_device(struct hv_device *device)static void free_net_device (struct netvsc_device *device) { -WARN_ON (atomic_read (&device->RefCount) ==0 ); - device->Device->Extension =NULL ; +WARN_ON (atomic_read (&device->refcnt) ==0 ); + device->dev->Extension =NULL ;kfree (device); }
@@ -105,8 +105,8 @@ static struct netvsc_device *get_outbound_net_device(struct hv_device *device)struct netvsc_device *net_device; net_device = device->Extension; -if (net_device &&atomic_read (&net_device->RefCount) >1 ) -atomic_inc (&net_device->RefCount); +if (net_device &&atomic_read (&net_device->refcnt) >1 ) +atomic_inc (&net_device->refcnt);else net_device =NULL ;
@@ -119,8 +119,8 @@ static struct netvsc_device *get_inbound_net_device(struct hv_device *device)struct netvsc_device *net_device; net_device = device->Extension; -if (net_device &&atomic_read (&net_device->RefCount)) -atomic_inc (&net_device->RefCount); +if (net_device &&atomic_read (&net_device->refcnt)) +atomic_inc (&net_device->refcnt);else net_device =NULL ;
@@ -134,7 +134,7 @@ static void put_net_device(struct hv_device *device) net_device = device->Extension;/* ASSERT(netDevice); */ -atomic_dec (&net_device->RefCount); +atomic_dec (&net_device->refcnt); } static struct netvsc_device *release_outbound_net_device(
@@ -147,7 +147,7 @@ static struct netvsc_device *release_outbound_net_device(return NULL ;/* Busy wait until the ref drop to 2, then set it to 1 */ -while (atomic_cmpxchg (&net_device->RefCount,2 ,1 ) !=2 ) +while (atomic_cmpxchg (&net_device->refcnt,2 ,1 ) !=2 )udelay (100 );return net_device;
@@ -163,7 +163,7 @@ static struct netvsc_device *release_inbound_net_device(return NULL ;/* Busy wait until the ref drop to 1, then set it to 0 */ -while (atomic_cmpxchg (&net_device->RefCount,1 ,0 ) !=1 ) +while (atomic_cmpxchg (&net_device->refcnt,1 ,0 ) !=1 )udelay (100 ); device->Extension =NULL ;
@@ -222,12 +222,12 @@ static int netvsc_init_recv_buf(struct hv_device *device)/* page-size grandularity */ /* ASSERT((netDevice->ReceiveBufferSize & (PAGE_SIZE - 1)) == 0); */ - net_device->ReceiveBuffer = -osd_page_alloc (net_device->ReceiveBufferSize >>PAGE_SHIFT ); -if (!net_device->ReceiveBuffer) { + net_device->recv_buf = +osd_page_alloc (net_device->recv_buf_size >>PAGE_SHIFT ); +if (!net_device->recv_buf) {DPRINT_ERR (NETVSC ,"unable to allocate receive buffer of size %d" , - net_device->ReceiveBufferSize); + net_device->recv_buf_size); ret =-1 ; goto Cleanup; }
@@ -242,9 +242,9 @@ static int netvsc_init_recv_buf(struct hv_device *device)* channel. Note: This call uses the vmbus connection rather * than the channel to establish the gpadl handle. */ - ret =vmbus_establish_gpadl (device->channel, net_device->ReceiveBuffer, - net_device->ReceiveBufferSize, - &net_device->ReceiveBufferGpadlHandle); + ret =vmbus_establish_gpadl (device->channel, net_device->recv_buf, + net_device->recv_buf_size, + &net_device->recv_buf_gpadl_handle);if (ret !=0 ) {DPRINT_ERR (NETVSC ,"unable to establish receive buffer's gpadl" );
@@ -256,15 +256,15 @@ static int netvsc_init_recv_buf(struct hv_device *device)/* Notify the NetVsp of the gpadl handle */ DPRINT_INFO (NETVSC ,"Sending NvspMessage1TypeSendReceiveBuffer..." ); - init_packet = &net_device->ChannelInitPacket; + init_packet = &net_device->channel_init_pkt;memset (init_packet,0 ,sizeof (struct nvsp_message )); - init_packet->Header.MessageType = NvspMessage1TypeSendReceiveBuffer; - init_packet->Messages.Version1Messages.SendReceiveBuffer. - GpadlHandle = net_device->ReceiveBufferGpadlHandle; - init_packet->Messages.Version1Messages. - SendReceiveBuffer.Id =NETVSC_RECEIVE_BUFFER_ID ; + init_packet->hdr.msg_type =NVSP_MSG1_TYPE_SEND_RECV_BUF ; + init_packet->msg.v1_msg.send_recv_buf. + gpadl_handle = net_device->recv_buf_gpadl_handle; + init_packet->msg.v1_msg. + send_recv_buf.id =NETVSC_RECEIVE_BUFFER_ID ;/* Send the gpadl notification request */ ret = vmbus_sendpacket(device->channel, init_packet,
@@ -278,15 +278,15 @@ static int netvsc_init_recv_buf(struct hv_device *device) goto Cleanup; } -osd_waitevent_wait (net_device->ChannelInitEvent); +osd_waitevent_wait (net_device->channel_init_event);/* Check the response */ -if (init_packet->Messages.Version1Messages. - SendReceiveBufferComplete.Status != NvspStatusSuccess) { +if (init_packet->msg.v1_msg. + send_recv_buf_complete.status !=NVSP_STAT_SUCCESS ) {DPRINT_ERR (NETVSC ,"Unable to complete receive buffer " "initialzation with NetVsp - status %d" , - init_packet->Messages.Version1Messages. - SendReceiveBufferComplete.Status); + init_packet->msg.v1_msg. + send_recv_buf_complete.status); ret =-1 ; goto Cleanup; }
@@ -295,36 +295,36 @@ static int netvsc_init_recv_buf(struct hv_device *device)/* ASSERT(netDevice->ReceiveSectionCount == 0); */ /* ASSERT(netDevice->ReceiveSections == NULL); */ - net_device->ReceiveSectionCount = init_packet->Messages. - Version1Messages.SendReceiveBufferComplete.NumSections; + net_device->recv_section_cnt = init_packet->msg. + v1_msg.send_recv_buf_complete.num_sections; - net_device->ReceiveSections =kmalloc (net_device->ReceiveSectionCount + net_device->recv_section =kmalloc (net_device->recv_section_cnt *sizeof (struct nvsp_1_receive_buffer_section ),GFP_KERNEL ); -if (net_device->ReceiveSections ==NULL ) { +if (net_device->recv_section ==NULL ) { ret =-1 ; goto Cleanup; } -memcpy (net_device->ReceiveSections, - init_packet->Messages.Version1Messages. - SendReceiveBufferComplete.Sections, - net_device->ReceiveSectionCount * +memcpy (net_device->recv_section, + init_packet->msg.v1_msg. + send_recv_buf_complete.sections, + net_device->recv_section_cnt *sizeof (struct nvsp_1_receive_buffer_section ));DPRINT_INFO (NETVSC ,"Receive sections info (count %d, offset %d, " "endoffset %d, suballoc size %d, num suballocs %d)" , - net_device->ReceiveSectionCount, - net_device->ReceiveSections[0 ].Offset, - net_device->ReceiveSections[0 ].EndOffset, - net_device->ReceiveSections[0 ].SubAllocationSize, - net_device->ReceiveSections[0 ].NumSubAllocations); + net_device->recv_section_cnt, + net_device->recv_section[0 ].offset, + net_device->recv_section[0 ].end_offset, + net_device->recv_section[0 ].sub_alloc_size, + net_device->recv_section[0 ].num_sub_allocs);/* * For 1st release, there should only be 1 section that represents the * entire receive buffer */ -if (net_device->ReceiveSectionCount !=1 || - net_device->ReceiveSections->Offset !=0 ) { +if (net_device->recv_section_cnt !=1 || + net_device->recv_section->offset !=0 ) { ret =-1 ; goto Cleanup; }
@@ -351,7 +351,7 @@ static int netvsc_init_send_buf(struct hv_device *device) "device being destroyed?");return -1 ; } -if (net_device->SendBufferSize <=0 ) { +if (net_device->send_buf_size <=0 ) { ret = -EINVAL ; goto Cleanup; }
@@ -359,11 +359,11 @@ static int netvsc_init_send_buf(struct hv_device *device)/* page-size grandularity */ /* ASSERT((netDevice->SendBufferSize & (PAGE_SIZE - 1)) == 0); */ - net_device->SendBuffer = -osd_page_alloc (net_device->SendBufferSize >>PAGE_SHIFT ); -if (!net_device->SendBuffer) { + net_device->send_buf = +osd_page_alloc (net_device->send_buf_size >>PAGE_SHIFT ); +if (!net_device->send_buf) {DPRINT_ERR (NETVSC ,"unable to allocate send buffer of size %d" , - net_device->SendBufferSize); + net_device->send_buf_size); ret =-1 ; goto Cleanup; }
@@ -377,9 +377,9 @@ static int netvsc_init_send_buf(struct hv_device *device)* channel. Note: This call uses the vmbus connection rather * than the channel to establish the gpadl handle. */ - ret =vmbus_establish_gpadl (device->channel, net_device->SendBuffer, - net_device->SendBufferSize, - &net_device->SendBufferGpadlHandle); + ret =vmbus_establish_gpadl (device->channel, net_device->send_buf, + net_device->send_buf_size, + &net_device->send_buf_gpadl_handle);if (ret !=0 ) {DPRINT_ERR (NETVSC ,"unable to establish send buffer's gpadl" ); goto Cleanup;
@@ -390,14 +390,14 @@ static int netvsc_init_send_buf(struct hv_device *device)/* Notify the NetVsp of the gpadl handle */ DPRINT_INFO (NETVSC ,"Sending NvspMessage1TypeSendSendBuffer..." ); - init_packet = &net_device->ChannelInitPacket; + init_packet = &net_device->channel_init_pkt;memset (init_packet,0 ,sizeof (struct nvsp_message )); - init_packet->Header.MessageType = NvspMessage1TypeSendSendBuffer; - init_packet->Messages.Version1Messages.SendReceiveBuffer. - GpadlHandle = net_device->SendBufferGpadlHandle; - init_packet->Messages.Version1Messages.SendReceiveBuffer.Id = + init_packet->hdr.msg_type =NVSP_MSG1_TYPE_SEND_SEND_BUF ; + init_packet->msg.v1_msg.send_recv_buf. + gpadl_handle = net_device->send_buf_gpadl_handle; + init_packet->msg.v1_msg.send_recv_buf.id =NETVSC_SEND_BUFFER_ID ;/* Send the gpadl notification request */
@@ -412,21 +412,21 @@ static int netvsc_init_send_buf(struct hv_device *device) goto Cleanup; } -osd_waitevent_wait (net_device->ChannelInitEvent); +osd_waitevent_wait (net_device->channel_init_event);/* Check the response */ -if (init_packet->Messages.Version1Messages. - SendSendBufferComplete.Status != NvspStatusSuccess) { +if (init_packet->msg.v1_msg. + send_send_buf_complete.status !=NVSP_STAT_SUCCESS ) {DPRINT_ERR (NETVSC ,"Unable to complete send buffer " "initialzation with NetVsp - status %d" , - init_packet->Messages.Version1Messages. - SendSendBufferComplete.Status); + init_packet->msg.v1_msg. + send_send_buf_complete.status); ret =-1 ; goto Cleanup; } - net_device->SendSectionSize = init_packet-> - Messages.Version1Messages.SendSendBufferComplete.SectionSize; + net_device->send_section_size = init_packet-> + msg.v1_msg.send_send_buf_complete.section_size; goto Exit;
@@ -449,20 +449,20 @@ static int netvsc_destroy_recv_buf(struct netvsc_device *net_device)* NvspMessage1TypeSendReceiveBuffer msg) therefore, we need * to send a revoke msg here */ -if (net_device->ReceiveSectionCount) { +if (net_device->recv_section_cnt) {DPRINT_INFO (NETVSC ,"Sending NvspMessage1TypeRevokeReceiveBuffer..." );/* Send the revoke receive buffer */ - revoke_packet = &net_device->RevokePacket; + revoke_packet = &net_device->revoke_packet;memset (revoke_packet,0 ,sizeof (struct nvsp_message )); - revoke_packet->Header.MessageType = - NvspMessage1TypeRevokeReceiveBuffer; - revoke_packet->Messages.Version1Messages. - RevokeReceiveBuffer.Id =NETVSC_RECEIVE_BUFFER_ID ; + revoke_packet->hdr.msg_type = +NVSP_MSG1_TYPE_REVOKE_RECV_BUF ; + revoke_packet->msg.v1_msg. + revoke_recv_buf.id =NETVSC_RECEIVE_BUFFER_ID ; - ret = vmbus_sendpacket(net_device->Device->channel, + ret = vmbus_sendpacket(net_device->dev->channel, revoke_packet, sizeof(struct nvsp_message), (unsigned long)revoke_packet,
@@ -479,11 +479,11 @@ static int netvsc_destroy_recv_buf(struct netvsc_device *net_device) }/* Teardown the gpadl on the vsp end */ -if (net_device->ReceiveBufferGpadlHandle) { +if (net_device->recv_buf_gpadl_handle) {DPRINT_INFO (NETVSC ,"Tearing down receive buffer's GPADL..." ); - ret =vmbus_teardown_gpadl (net_device->Device->channel, - net_device->ReceiveBufferGpadlHandle); + ret =vmbus_teardown_gpadl (net_device->dev->channel, + net_device->recv_buf_gpadl_handle);/* If we failed here, we might as well return and have a leak rather than continue and a bugchk */ if (ret !=0 ) {
@@ -491,22 +491,22 @@ static int netvsc_destroy_recv_buf(struct netvsc_device *net_device) "unable to teardown receive buffer's gpadl");return -1 ; } - net_device->ReceiveBufferGpadlHandle =0 ; + net_device->recv_buf_gpadl_handle =0 ; } -if (net_device->ReceiveBuffer) { +if (net_device->recv_buf) {DPRINT_INFO (NETVSC ,"Freeing up receive buffer..." );/* Free up the receive buffer */ -osd_page_free (net_device->ReceiveBuffer, - net_device->ReceiveBufferSize >>PAGE_SHIFT ); - net_device->ReceiveBuffer =NULL ; +osd_page_free (net_device->recv_buf, + net_device->recv_buf_size >>PAGE_SHIFT ); + net_device->recv_buf =NULL ; } -if (net_device->ReceiveSections) { - net_device->ReceiveSectionCount =0 ; -kfree (net_device->ReceiveSections); - net_device->ReceiveSections =NULL ; +if (net_device->recv_section) { + net_device->recv_section_cnt =0 ; +kfree (net_device->recv_section); + net_device->recv_section =NULL ; }return ret;
@@ -523,20 +523,20 @@ static int netvsc_destroy_send_buf(struct netvsc_device *net_device)* NvspMessage1TypeSendReceiveBuffer msg) therefore, we need * to send a revoke msg here */ -if (net_device->SendSectionSize) { +if (net_device->send_section_size) {DPRINT_INFO (NETVSC ,"Sending NvspMessage1TypeRevokeSendBuffer..." );/* Send the revoke send buffer */ - revoke_packet = &net_device->RevokePacket; + revoke_packet = &net_device->revoke_packet;memset (revoke_packet,0 ,sizeof (struct nvsp_message )); - revoke_packet->Header.MessageType = - NvspMessage1TypeRevokeSendBuffer; - revoke_packet->Messages.Version1Messages. - RevokeSendBuffer.Id =NETVSC_SEND_BUFFER_ID ; + revoke_packet->hdr.msg_type = +NVSP_MSG1_TYPE_REVOKE_SEND_BUF ; + revoke_packet->msg.v1_msg. + revoke_send_buf.id =NETVSC_SEND_BUFFER_ID ; - ret = vmbus_sendpacket(net_device->Device->channel, + ret = vmbus_sendpacket(net_device->dev->channel, revoke_packet, sizeof(struct nvsp_message), (unsigned long)revoke_packet,
@@ -553,10 +553,10 @@ static int netvsc_destroy_send_buf(struct netvsc_device *net_device) }/* Teardown the gpadl on the vsp end */ -if (net_device->SendBufferGpadlHandle) { +if (net_device->send_buf_gpadl_handle) {DPRINT_INFO (NETVSC ,"Tearing down send buffer's GPADL..." ); - ret =vmbus_teardown_gpadl (net_device->Device->channel, - net_device->SendBufferGpadlHandle); + ret =vmbus_teardown_gpadl (net_device->dev->channel, + net_device->send_buf_gpadl_handle);/* * If we failed here, we might as well return and have a leak
@@ -567,16 +567,16 @@ static int netvsc_destroy_send_buf(struct netvsc_device *net_device) "gpadl");return -1 ; } - net_device->SendBufferGpadlHandle =0 ; + net_device->send_buf_gpadl_handle =0 ; } -if (net_device->SendBuffer) { +if (net_device->send_buf) {DPRINT_INFO (NETVSC ,"Freeing up send buffer..." );/* Free up the receive buffer */ -osd_page_free (net_device->SendBuffer, - net_device->SendBufferSize >>PAGE_SHIFT ); - net_device->SendBuffer =NULL ; +osd_page_free (net_device->send_buf, + net_device->send_buf_size >>PAGE_SHIFT ); + net_device->send_buf =NULL ; }return ret;
@@ -597,13 +597,13 @@ static int netvsc_connect_vsp(struct hv_device *device)return -1 ; } - init_packet = &net_device->ChannelInitPacket; + init_packet = &net_device->channel_init_pkt;memset (init_packet,0 ,sizeof (struct nvsp_message )); - init_packet->Header.MessageType = NvspMessageTypeInit; - init_packet->Messages.InitMessages.Init.MinProtocolVersion = + init_packet->hdr.msg_type =NVSP_MSG_TYPE_INIT ; + init_packet->msg.init_msg.init.min_protocol_ver =NVSP_MIN_PROTOCOL_VERSION ; - init_packet->Messages.InitMessages.Init.MaxProtocolVersion = + init_packet->msg.init_msg.init.max_protocol_ver =NVSP_MAX_PROTOCOL_VERSION ;DPRINT_INFO (NETVSC ,"Sending NvspMessageTypeInit..." );
@@ -620,30 +620,30 @@ static int netvsc_connect_vsp(struct hv_device *device) goto Cleanup; } -osd_waitevent_wait (net_device->ChannelInitEvent); +osd_waitevent_wait (net_device->channel_init_event);/* Now, check the response */ /* ASSERT(initPacket->Messages.InitMessages.InitComplete.MaximumMdlChainLength <= MAX_MULTIPAGE_BUFFER_COUNT); */ DPRINT_INFO (NETVSC ,"NvspMessageTypeInit status(%d) max mdl chain (%d)" , - init_packet->Messages.InitMessages.InitComplete.Status, - init_packet->Messages.InitMessages. - InitComplete.MaximumMdlChainLength); + init_packet->msg.init_msg.init_complete.status, + init_packet->msg.init_msg. + init_complete.max_mdl_chain_len); -if (init_packet->Messages.InitMessages.InitComplete.Status != - NvspStatusSuccess) { +if (init_packet->msg.init_msg.init_complete.status != +NVSP_STAT_SUCCESS ) {DPRINT_ERR (NETVSC ,"unable to initialize with netvsp (status 0x%x)" , - init_packet->Messages.InitMessages.InitComplete.Status); + init_packet->msg.init_msg.init_complete.status); ret =-1 ; goto Cleanup; } -if (init_packet->Messages.InitMessages.InitComplete. - NegotiatedProtocolVersion !=NVSP_PROTOCOL_VERSION_1 ) { +if (init_packet->msg.init_msg.init_complete. + negotiated_protocol_ver !=NVSP_PROTOCOL_VERSION_1 ) {DPRINT_ERR (NETVSC ,"unable to initialize with netvsp " "(version expected 1 got %d)" , - init_packet->Messages.InitMessages. - InitComplete.NegotiatedProtocolVersion); + init_packet->msg.init_msg. + init_complete.negotiated_protocol_ver); ret =-1 ; goto Cleanup; }
@@ -654,12 +654,12 @@ static int netvsc_connect_vsp(struct hv_device *device) ndis_version =0x00050000 ; - init_packet->Header.MessageType = NvspMessage1TypeSendNdisVersion; - init_packet->Messages.Version1Messages. - SendNdisVersion.NdisMajorVersion = + init_packet->hdr.msg_type =NVSP_MSG1_TYPE_SEND_NDIS_VER ; + init_packet->msg.v1_msg. + send_ndis_ver.ndis_major_ver = (ndis_version &0xFFFF0000 ) >>16 ; - init_packet->Messages.Version1Messages. - SendNdisVersion.NdisMinorVersion = + init_packet->msg.v1_msg. + send_ndis_ver.ndis_minor_ver = ndis_version &0xFFFF ;/* Send the init request */
@@ -719,12 +719,12 @@ static int netvsc_device_add(struct hv_device *device, void *additional_info)DPRINT_DBG (NETVSC ,"netvsc channel object allocated - %p" , net_device);/* Initialize the NetVSC channel extension */ - net_device->ReceiveBufferSize =NETVSC_RECEIVE_BUFFER_SIZE ; -spin_lock_init (&net_device->receive_packet_list_lock); + net_device->recv_buf_size =NETVSC_RECEIVE_BUFFER_SIZE ; +spin_lock_init (&net_device->recv_pkt_list_lock); - net_device->SendBufferSize =NETVSC_SEND_BUFFER_SIZE ; + net_device->send_buf_size =NETVSC_SEND_BUFFER_SIZE ; -INIT_LIST_HEAD (&net_device->ReceivePacketList); +INIT_LIST_HEAD (&net_device->recv_pkt_list);for (i =0 ; i <NETVSC_RECEIVE_PACKETLIST_COUNT ; i++) { packet = kzalloc(sizeof(struct hv_netvsc_packet) +
@@ -737,10 +737,10 @@ static int netvsc_device_add(struct hv_device *device, void *additional_info)break ; }list_add_tail (&packet->list_ent, - &net_device->ReceivePacketList); + &net_device->recv_pkt_list); } - net_device->ChannelInitEvent =osd_waitevent_create (); -if (!net_device->ChannelInitEvent) { + net_device->channel_init_event =osd_waitevent_create (); +if (!net_device->channel_init_event) { ret = -ENOMEM ; goto Cleanup; }
@@ -779,10 +779,10 @@ close: Cleanup:if (net_device) { -kfree (net_device->ChannelInitEvent); +kfree (net_device->channel_init_event);list_for_each_entry_safe (packet, pos, - &net_device->ReceivePacketList, + &net_device->recv_pkt_list, list_ent) {list_del (&packet->list_ent);kfree (packet);
@@ -816,9 +816,9 @@ static int netvsc_device_remove(struct hv_device *device) }/* Wait for all send completions */ -while (atomic_read (&net_device->NumOutstandingSends)) { +while (atomic_read (&net_device->num_outstanding_sends)) {DPRINT_INFO (NETVSC ,"waiting for %d requests to complete..." , -atomic_read (&net_device->NumOutstandingSends)); +atomic_read (&net_device->num_outstanding_sends));udelay (100 ); }
@@ -840,12 +840,12 @@ static int netvsc_device_remove(struct hv_device *device)/* Release all resources */ list_for_each_entry_safe (netvsc_packet, pos, - &net_device->ReceivePacketList, list_ent) { + &net_device->recv_pkt_list, list_ent) {list_del (&netvsc_packet->list_ent);kfree (netvsc_packet); } -kfree (net_device->ChannelInitEvent); +kfree (net_device->channel_init_event);free_net_device (net_device);return 0 ; }
@@ -875,19 +875,19 @@ static void netvsc_send_completion(struct hv_device *device, (packet->DataOffset8 << 3));DPRINT_DBG (NETVSC ,"send completion packet - type %d" , - nvsp_packet->Header.MessageType); + nvsp_packet->hdr.msg_type); -if ((nvsp_packet->Header.MessageType == NvspMessageTypeInitComplete) || - (nvsp_packet->Header.MessageType == - NvspMessage1TypeSendReceiveBufferComplete) || - (nvsp_packet->Header.MessageType == - NvspMessage1TypeSendSendBufferComplete)) { +if ((nvsp_packet->hdr.msg_type ==NVSP_MSG_TYPE_INIT_COMPLETE ) || + (nvsp_packet->hdr.msg_type == +NVSP_MSG1_TYPE_SEND_RECV_BUF_COMPLETE ) || + (nvsp_packet->hdr.msg_type == +NVSP_MSG1_TYPE_SEND_SEND_BUF_COMPLETE )) {/* Copy the response back */ -memcpy (&net_device->ChannelInitPacket, nvsp_packet, +memcpy (&net_device->channel_init_pkt, nvsp_packet,sizeof (struct nvsp_message )); -osd_waitevent_set (net_device->ChannelInitEvent); - }else if (nvsp_packet->Header.MessageType == - NvspMessage1TypeSendRNDISPacketComplete) { +osd_waitevent_set (net_device->channel_init_event); + }else if (nvsp_packet->hdr.msg_type == +NVSP_MSG1_TYPE_SEND_RNDIS_PKT_COMPLETE ) {/* Get the send context */ nvsc_packet = (struct hv_netvsc_packet *)(unsigned long ) packet->TransactionId;
@@ -897,10 +897,10 @@ static void netvsc_send_completion(struct hv_device *device, nvsc_packet->completion.send.send_completion ( nvsc_packet->completion.send.send_completion_ctx); -atomic_dec (&net_device->NumOutstandingSends); +atomic_dec (&net_device->num_outstanding_sends); }else {DPRINT_ERR (NETVSC ,"Unknown send completion packet type - " -"%d received!!" , nvsp_packet->Header.MessageType); +"%d received!!" , nvsp_packet->hdr.msg_type); }put_net_device (device);
@@ -921,18 +921,19 @@ static int netvsc_send(struct hv_device *device,return -2 ; } - sendMessage.Header.MessageType = NvspMessage1TypeSendRNDISPacket; + sendMessage.hdr.msg_type =NVSP_MSG1_TYPE_SEND_RNDIS_PKT ;if (packet->is_data_pkt) {/* 0 is RMC_DATA; */ - sendMessage.Messages.Version1Messages.SendRNDISPacket.ChannelType =0 ; + sendMessage.msg.v1_msg.send_rndis_pkt.channel_type =0 ; }else {/* 1 is RMC_CONTROL; */ - sendMessage.Messages.Version1Messages.SendRNDISPacket.ChannelType =1 ; + sendMessage.msg.v1_msg.send_rndis_pkt.channel_type =1 ; }/* Not using send buffer section */ - sendMessage.Messages.Version1Messages.SendRNDISPacket.SendBufferSectionIndex =0xFFFFFFFF ; - sendMessage.Messages.Version1Messages.SendRNDISPacket.SendBufferSectionSize =0 ; + sendMessage.msg.v1_msg.send_rndis_pkt.send_buf_section_index = +0xFFFFFFFF ; + sendMessage.msg.v1_msg.send_rndis_pkt.send_buf_section_size =0 ;if (packet->page_buf_cnt) { ret = vmbus_sendpacket_pagebuffer(device->channel,
@@ -954,7 +955,7 @@ static int netvsc_send(struct hv_device *device,DPRINT_ERR (NETVSC ,"Unable to send packet %p ret %d" , packet, ret); -atomic_inc (&net_device->NumOutstandingSends); +atomic_inc (&net_device->num_outstanding_sends);put_net_device (device);return ret; }
@@ -997,16 +998,16 @@ static void netvsc_receive(struct hv_device *device, (packet->DataOffset8 << 3));/* Make sure this is a valid nvsp packet */ -if (nvsp_packet->Header.MessageType != - NvspMessage1TypeSendRNDISPacket) { +if (nvsp_packet->hdr.msg_type != +NVSP_MSG1_TYPE_SEND_RNDIS_PKT ) {DPRINT_ERR (NETVSC ,"Unknown nvsp packet type received - %d" , - nvsp_packet->Header.MessageType); + nvsp_packet->hdr.msg_type);put_net_device (device);return ; }DPRINT_DBG (NETVSC ,"NVSP packet received - type %d" , - nvsp_packet->Header.MessageType); + nvsp_packet->hdr.msg_type); vmxferpage_packet = (struct vmtransfer_page_packet_header *)packet;
@@ -1027,13 +1028,13 @@ static void netvsc_receive(struct hv_device *device,* We grab it here so that we know exactly how many we can * fulfil */ -spin_lock_irqsave (&net_device->receive_packet_list_lock, flags); -while (!list_empty (&net_device->ReceivePacketList)) { -list_move_tail (net_device->ReceivePacketList.next, &listHead); +spin_lock_irqsave (&net_device->recv_pkt_list_lock, flags); +while (!list_empty (&net_device->recv_pkt_list)) { +list_move_tail (net_device->recv_pkt_list.next, &listHead);if (++count == vmxferpage_packet->RangeCount +1 )break ; } -spin_unlock_irqrestore (&net_device->receive_packet_list_lock, flags); +spin_unlock_irqrestore (&net_device->recv_pkt_list_lock, flags);/* * We need at least 2 netvsc pkts (1 to represent the xfer
@@ -1046,12 +1047,12 @@ static void netvsc_receive(struct hv_device *device, count, vmxferpage_packet->RangeCount + 1);/* Return it to the freelist */ -spin_lock_irqsave (&net_device->receive_packet_list_lock, flags); +spin_lock_irqsave (&net_device->recv_pkt_list_lock, flags);for (i = count; i !=0 ; i--) {list_move_tail (listHead.next, - &net_device->ReceivePacketList); + &net_device->recv_pkt_list); } -spin_unlock_irqrestore (&net_device->receive_packet_list_lock, +spin_unlock_irqrestore (&net_device->recv_pkt_list_lock, flags); netvsc_send_recv_completion(device,
@@ -1104,10 +1105,10 @@ static void netvsc_receive(struct hv_device *device, vmxferpage_packet->Ranges[i].ByteCount; start =virt_to_phys ((void *)((unsigned long )net_device-> - ReceiveBuffer + vmxferpage_packet->Ranges[i].ByteOffset)); + recv_buf + vmxferpage_packet->Ranges[i].ByteOffset)); netvsc_packet->page_buf[0 ].Pfn = start >>PAGE_SHIFT ; - end_virtual = (unsigned long )net_device->ReceiveBuffer + end_virtual = (unsigned long )net_device->recv_buf + vmxferpage_packet->Ranges[i].ByteOffset + vmxferpage_packet->Ranges[i].ByteCount -1 ; end =virt_to_phys ((void *)end_virtual);
@@ -1175,11 +1176,12 @@ static void netvsc_send_recv_completion(struct hv_device *device,DPRINT_DBG (NETVSC ,"Sending receive completion pkt - %llx" , transaction_id); - recvcompMessage.Header.MessageType = - NvspMessage1TypeSendRNDISPacketComplete; + recvcompMessage.hdr.msg_type = +NVSP_MSG1_TYPE_SEND_RNDIS_PKT_COMPLETE ;/* FIXME: Pass in the status */ - recvcompMessage.Messages.Version1Messages.SendRNDISPacketComplete.Status = NvspStatusSuccess; + recvcompMessage.msg.v1_msg.send_rndis_pkt_complete.status = +NVSP_STAT_SUCCESS ; retry_send_cmplt:/* Send the completion */
@@ -1234,7 +1236,7 @@ static void netvsc_receive_completion(void *context) }/* Overloading use of the lock. */ -spin_lock_irqsave (&net_device->receive_packet_list_lock, flags); +spin_lock_irqsave (&net_device->recv_pkt_list_lock, flags);/* ASSERT(packet->XferPagePacket->Count > 0); */ packet->xfer_page_pkt->count--;
@@ -1247,13 +1249,13 @@ static void netvsc_receive_completion(void *context) fsend_receive_comp = true; transaction_id = packet->completion.recv.recv_completion_tid;list_add_tail (&packet->xfer_page_pkt->list_ent, - &net_device->ReceivePacketList); + &net_device->recv_pkt_list); }/* Put the packet back */ -list_add_tail (&packet->list_ent, &net_device->ReceivePacketList); -spin_unlock_irqrestore (&net_device->receive_packet_list_lock, flags); +list_add_tail (&packet->list_ent, &net_device->recv_pkt_list); +spin_unlock_irqrestore (&net_device->recv_pkt_list_lock, flags);/* Send a receive completion for the xfer page packet */ if (fsend_receive_comp)
drivers/staging/hv/netvsc.h +82 -82
315 lines not on this page · raw message
drivers/staging/hv/netvsc_api.h +1 -1
@@ -95,7 +95,7 @@ struct netvsc_driver {*/ int (*recv_cb)(struct hv_device *dev,struct hv_netvsc_packet *packet); -void (*link_status_change)(struct hv_device *dev,u32 Status); +void (*link_status_change)(struct hv_device *dev,u32 status);/* Specific to this driver */ int (*send)(struct hv_device *dev,struct hv_netvsc_packet *packet);
drivers/staging/hv/rndis_filter.c +11 -11
@@ -266,7 +266,7 @@ static int rndis_filter_send_request(struct rndis_device *dev, rndis_filter_send_request_completion; packet->completion.send.send_completion_tid = (unsigned long )dev; - ret = rndis_filter.inner_drv.send (dev->net_dev->Device, packet); + ret = rndis_filter.inner_drv.send (dev->net_dev->dev, packet);return ret; }
@@ -338,10 +338,10 @@ static void rndis_filter_receive_indicate_status(struct rndis_device *dev,if (indicate->Status ==RNDIS_STATUS_MEDIA_CONNECT ) { rndis_filter.inner_drv.link_status_change ( - dev->net_dev->Device,1 ); + dev->net_dev->dev,1 ); }else if (indicate->Status ==RNDIS_STATUS_MEDIA_DISCONNECT ) { rndis_filter.inner_drv.link_status_change ( - dev->net_dev->Device,0 ); + dev->net_dev->dev,0 ); }else {/* * TODO:
@@ -376,7 +376,7 @@ static void rndis_filter_receive_data(struct rndis_device *dev, pkt->is_data_pkt = true; - rndis_filter.inner_drv.recv_cb (dev->net_dev->Device, + rndis_filter.inner_drv.recv_cb (dev->net_dev->dev, pkt); }
@@ -392,13 +392,13 @@ static int rndis_filter_receive(struct hv_device *dev,return -EINVAL ;/* Make sure the rndis device state is initialized */ -if (!net_dev->Extension) { +if (!net_dev->extension) {DPRINT_ERR (NETVSC ,"got rndis message but no rndis device..." "dropping this message!" );return -1 ; } - rndis_dev = (struct rndis_device *)net_dev->Extension; + rndis_dev = (struct rndis_device *)net_dev->extension;if (rndis_dev->state ==RNDIS_DEV_UNINITIALIZED ) {DPRINT_ERR (NETVSC ,"got rndis message but rndis device " "uninitialized...dropping this message!" );
@@ -782,7 +782,7 @@ static int rndis_filte_device_add(struct hv_device *dev,/* ASSERT(netDevice); */ /* ASSERT(netDevice->Device); */ - netDevice->Extension = rndisDevice; + netDevice->extension = rndisDevice; rndisDevice->net_dev = netDevice;/* Send the rndis initialization message */
@@ -819,13 +819,13 @@ static int rndis_filte_device_add(struct hv_device *dev,static int rndis_filter_device_remove (struct hv_device *dev) {struct netvsc_device *net_dev = dev->Extension; -struct rndis_device *rndis_dev = net_dev->Extension; +struct rndis_device *rndis_dev = net_dev->extension;/* Halt and release the rndis device */ rndis_filter_halt_device (rndis_dev);kfree (rndis_dev); - net_dev->Extension =NULL ; + net_dev->extension =NULL ;/* Pass control to inner driver to remove the device */ rndis_filter.inner_drv.base.OnDeviceRemove (dev);
@@ -844,7 +844,7 @@ int rndis_filter_open(struct hv_device *dev)if (!netDevice)return -EINVAL ; -return rndis_filter_open_device (netDevice->Extension); +return rndis_filter_open_device (netDevice->extension); }int rndis_filter_close (struct hv_device *dev)
@@ -854,7 +854,7 @@ int rndis_filter_close(struct hv_device *dev)if (!netDevice)return -EINVAL ; -return rndis_filter_close_device (netDevice->Extension); +return rndis_filter_close_device (netDevice->extension); } static int rndis_filter_send(struct hv_device *dev,
Signature · 1 line
1.6.3.2
PATCH 7/7 staging: hv: Convert camel cased struct fields in rndis.h to lower cases
--- drivers/staging/hv/rndis.h | 353 +++++++++++++++++++------------------ drivers/staging/hv/rndis_filter.c | 204 +++++++++++----------- 2 files changed, 279 insertions(+), 278 deletions(-)
drivers/staging/hv/rndis.h +177 -176
@@ -288,24 +288,24 @@#define RNDIS_DF_RAW_DATA 0x00000004/* Remote NDIS medium types. */ -#define RNdisMedium802_3 0x00000000 -#define RNdisMedium802_5 0x00000001 -#define RNdisMediumFddi 0x00000002 -#define RNdisMediumWan 0x00000003 -#define RNdisMediumLocalTalk 0x00000004 -#define RNdisMediumArcnetRaw 0x00000006 -#define RNdisMediumArcnet878_2 0x00000007 -#define RNdisMediumAtm 0x00000008 -#define RNdisMediumWirelessWan 0x00000009 -#define RNdisMediumIrda 0x0000000a -#define RNdisMediumCoWan 0x0000000b +#define RNDIS_MEDIUM_802_3 0x00000000 +#define RNDIS_MEDIUM_802_5 0x00000001 +#define RNDIS_MEDIUM_FDDI 0x00000002 +#define RNDIS_MEDIUM_WAN 0x00000003 +#define RNDIS_MEDIUM_LOCAL_TALK 0x00000004 +#define RNDIS_MEDIUM_ARCNET_RAW 0x00000006 +#define RNDIS_MEDIUM_ARCNET_878_2 0x00000007 +#define RNDIS_MEDIUM_ATM 0x00000008 +#define RNDIS_MEDIUM_WIRELESS_WAN 0x00000009 +#define RNDIS_MEDIUM_IRDA 0x0000000a +#define RNDIS_MEDIUM_CO_WAN 0x0000000b/* Not a real medium, defined as an upper-bound */ -#define RNdisMediumMax 0x0000000d +#define RNDIS_MEDIUM_MAX 0x0000000d/* Remote NDIS medium connection states. */ -#define RNdisMediaStateConnected 0x00000000 -#define RNdisMediaStateDisconnected 0x00000001 +#define RNDIS_MEDIA_STATE_CONNECTED 0x00000000 +#define RNDIS_MEDIA_STATE_DISCONNECTED 0x00000001/* Remote NDIS version numbers */ #define RNDIS_MAJOR_VERSION 0x00000001
@@ -314,106 +314,106 @@/* NdisInitialize message */ struct rndis_initialize_request { -u32 RequestId; -u32 MajorVersion; -u32 MinorVersion; -u32 MaxTransferSize; +u32 req_id; +u32 major_ver; +u32 minor_ver; +u32 max_xfer_size; };/* Response to NdisInitialize */ struct rndis_initialize_complete { -u32 RequestId; -u32 Status; -u32 MajorVersion; -u32 MinorVersion; -u32 DeviceFlags; -u32 Medium; -u32 MaxPacketsPerMessage; -u32 MaxTransferSize; -u32 PacketAlignmentFactor; -u32 AFListOffset; -u32 AFListSize; +u32 req_id; +u32 status; +u32 major_ver; +u32 minor_ver; +u32 dev_flags; +u32 medium; +u32 max_pkt_per_msg; +u32 max_xfer_size; +u32 pkt_alignment_factor; +u32 af_list_offset; +u32 af_list_size; };/* Call manager devices only: Information about an address family */ /* supported by the device is appended to the response to NdisInitialize. */ struct rndis_co_address_family { -u32 AddressFamily; -u32 MajorVersion; -u32 MinorVersion; +u32 address_family; +u32 major_ver; +u32 minor_ver; };/* NdisHalt message */ struct rndis_halt_request { -u32 RequestId; +u32 req_id; };/* NdisQueryRequest message */ struct rndis_query_request { -u32 RequestId; -u32 Oid; -u32 InformationBufferLength; -u32 InformationBufferOffset; -u32 DeviceVcHandle; +u32 req_id; +u32 oid; +u32 info_buflen; +u32 info_buf_offset; +u32 dev_vc_handle; };/* Response to NdisQueryRequest */ struct rndis_query_complete { -u32 RequestId; -u32 Status; -u32 InformationBufferLength; -u32 InformationBufferOffset; +u32 req_id; +u32 status; +u32 info_buflen; +u32 info_buf_offset; };/* NdisSetRequest message */ struct rndis_set_request { -u32 RequestId; -u32 Oid; -u32 InformationBufferLength; -u32 InformationBufferOffset; -u32 DeviceVcHandle; +u32 req_id; +u32 oid; +u32 info_buflen; +u32 info_buf_offset; +u32 dev_vc_handle; };/* Response to NdisSetRequest */ struct rndis_set_complete { -u32 RequestId; -u32 Status; +u32 req_id; +u32 status; };/* NdisReset message */ struct rndis_reset_request { -u32 Reserved; +u32 reserved; };/* Response to NdisReset */ struct rndis_reset_complete { -u32 Status; -u32 AddressingReset; +u32 status; +u32 addressing_reset; };/* NdisMIndicateStatus message */ struct rndis_indicate_status { -u32 Status; -u32 StatusBufferLength; -u32 StatusBufferOffset; +u32 status; +u32 status_buflen; +u32 status_buf_offset; };/* Diagnostic information passed as the status buffer in */ /* struct rndis_indicate_status messages signifying error conditions. */ struct rndis_diagnostic_info { -u32 DiagStatus; -u32 ErrorOffset; +u32 diag_status; +u32 error_offset; };/* NdisKeepAlive message */ struct rndis_keepalive_request { -u32 RequestId; +u32 req_id; };/* Response to NdisKeepAlive */ struct rndis_keepalive_complete { -u32 RequestId; -u32 Status; +u32 req_id; +u32 status; };/*
@@ -422,39 +422,39 @@ struct rndis_keepalive_complete {* to 0 for connectionless data, otherwise it contains the VC handle. */ struct rndis_packet { -u32 DataOffset; -u32 DataLength; -u32 OOBDataOffset; -u32 OOBDataLength; -u32 NumOOBDataElements; -u32 PerPacketInfoOffset; -u32 PerPacketInfoLength; -u32 VcHandle; -u32 Reserved; +u32 data_offset; +u32 data_len; +u32 oob_data_offset; +u32 oob_data_len; +u32 num_oob_data_elements; +u32 per_pkt_info_offset; +u32 per_pkt_info_len; +u32 vc_handle; +u32 reserved; };/* Optional Out of Band data associated with a Data message. */ struct rndis_oobd { -u32 Size; -u32 Type; -u32 ClassInformationOffset; +u32 size; +u32 type; +u32 class_info_offset; };/* Packet extension field contents associated with a Data message. */ struct rndis_per_packet_info { -u32 Size; -u32 Type; -u32 PerPacketInformationOffset; +u32 size; +u32 type; +u32 per_pkt_info_offset; };/* Format of Information buffer passed in a SetRequest for the OID */ /* OID_GEN_RNDIS_CONFIG_PARAMETER. */ struct rndis_config_parameter_info { -u32 ParameterNameOffset; -u32 ParameterNameLength; -u32 ParameterType; -u32 ParameterValueOffset; -u32 ParameterValueLength; +u32 parameter_name_offset; +u32 parameter_name_length; +u32 parameter_type; +u32 parameter_value_offset; +u32 parameter_value_length; };/* Values for ParameterType in struct rndis_config_parameter_info */
@@ -466,187 +466,188 @@ struct rndis_config_parameter_info {/* CoNdisMiniportCreateVc message */ struct rcondis_mp_create_vc { -u32 RequestId; -u32 NdisVcHandle; +u32 req_id; +u32 ndis_vc_handle; };/* Response to CoNdisMiniportCreateVc */ struct rcondis_mp_create_vc_complete { -u32 RequestId; -u32 DeviceVcHandle; -u32 Status; +u32 req_id; +u32 dev_vc_handle; +u32 status; };/* CoNdisMiniportDeleteVc message */ struct rcondis_mp_delete_vc { -u32 RequestId; -u32 DeviceVcHandle; +u32 req_id; +u32 dev_vc_handle; };/* Response to CoNdisMiniportDeleteVc */ struct rcondis_mp_delete_vc_complete { -u32 RequestId; -u32 Status; +u32 req_id; +u32 status; };/* CoNdisMiniportQueryRequest message */ struct rcondis_mp_query_request { -u32 RequestId; -u32 RequestType; -u32 Oid; -u32 DeviceVcHandle; -u32 InformationBufferLength; -u32 InformationBufferOffset; +u32 req_id; +u32 request_type; +u32 oid; +u32 dev_vc_handle; +u32 info_buflen; +u32 info_buf_offset; };/* CoNdisMiniportSetRequest message */ struct rcondis_mp_set_request { -u32 RequestId; -u32 RequestType; -u32 Oid; -u32 DeviceVcHandle; -u32 InformationBufferLength; -u32 InformationBufferOffset; +u32 req_id; +u32 request_type; +u32 oid; +u32 dev_vc_handle; +u32 info_buflen; +u32 info_buf_offset; };/* CoNdisIndicateStatus message */ struct rcondis_indicate_status { -u32 NdisVcHandle; -u32 Status; -u32 StatusBufferLength; -u32 StatusBufferOffset; +u32 ndis_vc_handle; +u32 status; +u32 status_buflen; +u32 status_buf_offset; };/* CONDIS Call/VC parameters */ struct rcondis_specific_parameters { -u32 ParameterType; -u32 ParameterLength; -u32 ParameterOffset; +u32 parameter_type; +u32 parameter_length; +u32 parameter_lffset; };struct rcondis_media_parameters { -u32 Flags; -u32 Reserved1; -u32 Reserved2; -struct rcondis_specific_parameters MediaSpecific; +u32 flags; +u32 reserved1; +u32 reserved2; +struct rcondis_specific_parameters media_specific; };struct rndis_flowspec { -u32 TokenRate; -u32 TokenBucketSize; -u32 PeakBandwidth; -u32 Latency; -u32 DelayVariation; -u32 ServiceType; -u32 MaxSduSize; -u32 MinimumPolicedSize; +u32 token_rate; +u32 token_bucket_size; +u32 peak_bandwidth; +u32 latency; +u32 delay_variation; +u32 service_type; +u32 max_sdu_size; +u32 minimum_policed_size; };struct rcondis_call_manager_parameters { -struct rndis_flowspec Transmit; -struct rndis_flowspec Receive; -struct rcondis_specific_parameters CallMgrSpecific; +struct rndis_flowspec transmit; +struct rndis_flowspec receive; +struct rcondis_specific_parameters call_mgr_specific; };/* CoNdisMiniportActivateVc message */ struct rcondis_mp_activate_vc_request { -u32 RequestId; -u32 Flags; -u32 DeviceVcHandle; -u32 MediaParamsOffset; -u32 MediaParamsLength; -u32 CallMgrParamsOffset; -u32 CallMgrParamsLength; +u32 req_id; +u32 flags; +u32 dev_vc_handle; +u32 media_params_offset; +u32 media_params_length; +u32 call_mgr_params_offset; +u32 call_mgr_params_length; };/* Response to CoNdisMiniportActivateVc */ struct rcondis_mp_activate_vc_complete { -u32 RequestId; -u32 Status; +u32 req_id; +u32 status; };/* CoNdisMiniportDeactivateVc message */ struct rcondis_mp_deactivate_vc_request { -u32 RequestId; -u32 Flags; -u32 DeviceVcHandle; +u32 req_id; +u32 flags; +u32 dev_vc_handle; };/* Response to CoNdisMiniportDeactivateVc */ struct rcondis_mp_deactivate_vc_complete { -u32 RequestId; -u32 Status; +u32 req_id; +u32 status; };/* union with all of the RNDIS messages */ union rndis_message_container { -struct rndis_packet Packet; -struct rndis_initialize_request InitializeRequest; -struct rndis_halt_request HaltRequest; -struct rndis_query_request QueryRequest; -struct rndis_set_request SetRequest; -struct rndis_reset_request ResetRequest; -struct rndis_keepalive_request KeepaliveRequest; -struct rndis_indicate_status IndicateStatus; -struct rndis_initialize_complete InitializeComplete; -struct rndis_query_complete QueryComplete; -struct rndis_set_complete SetComplete; -struct rndis_reset_complete ResetComplete; -struct rndis_keepalive_complete KeepaliveComplete; -struct rcondis_mp_create_vc CoMiniportCreateVc; -struct rcondis_mp_delete_vc CoMiniportDeleteVc; -struct rcondis_indicate_status CoIndicateStatus; -struct rcondis_mp_activate_vc_request CoMiniportActivateVc; -struct rcondis_mp_deactivate_vc_request CoMiniportDeactivateVc; -struct rcondis_mp_create_vc_complete CoMiniportCreateVcComplete; -struct rcondis_mp_delete_vc_complete CoMiniportDeleteVcComplete; -struct rcondis_mp_activate_vc_complete CoMiniportActivateVcComplete; -struct rcondis_mp_deactivate_vc_complete CoMiniportDeactivateVcComplete; +struct rndis_packet pkt; +struct rndis_initialize_request init_req; +struct rndis_halt_request halt_req; +struct rndis_query_request query_req; +struct rndis_set_request set_req; +struct rndis_reset_request reset_req; +struct rndis_keepalive_request keep_alive_req; +struct rndis_indicate_status indicate_status; +struct rndis_initialize_complete init_complete; +struct rndis_query_complete query_complete; +struct rndis_set_complete set_complete; +struct rndis_reset_complete reset_complete; +struct rndis_keepalive_complete keep_alive_complete; +struct rcondis_mp_create_vc co_miniport_create_vc; +struct rcondis_mp_delete_vc co_miniport_delete_vc; +struct rcondis_indicate_status co_indicate_status; +struct rcondis_mp_activate_vc_request co_miniport_activate_vc; +struct rcondis_mp_deactivate_vc_request co_miniport_deactivate_vc; +struct rcondis_mp_create_vc_complete co_miniport_create_vc_complete; +struct rcondis_mp_delete_vc_complete co_miniport_delete_vc_complete; +struct rcondis_mp_activate_vc_complete co_miniport_activate_vc_complete; +struct rcondis_mp_deactivate_vc_complete + co_miniport_deactivate_vc_complete; };/* Remote NDIS message format */ struct rndis_message { -u32 NdisMessageType; +u32 ndis_msg_type;/* Total length of this message, from the beginning */ /* of the sruct rndis_message, in bytes. */ -u32 MessageLength; +u32 msg_len;/* Actual message */ -union rndis_message_container Message; +union rndis_message_container msg; };/* Handy macros */ /* get the size of an RNDIS message. Pass in the message type, */ /* struct rndis_set_request, struct rndis_packet for example */ -#define RNDIS_MESSAGE_SIZE (Message) \ - (sizeof(Message) + (sizeof(struct rndis_message) - \ +#define RNDIS_MESSAGE_SIZE (msg) \ + (sizeof(msg) + (sizeof(struct rndis_message) - \ sizeof(union rndis_message_container)))/* get pointer to info buffer with message pointer */ -#define MESSAGE_TO_INFO_BUFFER (Message) \ - (((unsigned char *)(Message)) + Message->InformationBufferOffset) +#define MESSAGE_TO_INFO_BUFFER (msg) \ + (((unsigned char *)(msg)) + msg->info_buf_offset)/* get pointer to status buffer with message pointer */ -#define MESSAGE_TO_STATUS_BUFFER (Message) \ - (((unsigned char *)(Message)) + Message->StatusBufferOffset) +#define MESSAGE_TO_STATUS_BUFFER (msg) \ + (((unsigned char *)(msg)) + msg->status_buf_offset)/* get pointer to OOBD buffer with message pointer */ -#define MESSAGE_TO_OOBD_BUFFER (Message) \ - (((unsigned char *)(Message)) + Message->OOBDataOffset) +#define MESSAGE_TO_OOBD_BUFFER (msg) \ + (((unsigned char *)(msg)) + msg->oob_data_offset)/* get pointer to data buffer with message pointer */ -#define MESSAGE_TO_DATA_BUFFER (Message) \ - (((unsigned char *)(Message)) + Message->PerPacketInfoOffset) +#define MESSAGE_TO_DATA_BUFFER (msg) \ + (((unsigned char *)(msg)) + msg->per_pkt_info_offset)/* get pointer to contained message from NDIS_MESSAGE pointer */ -#define RNDIS_MESSAGE_PTR_TO_MESSAGE_PTR (RndisMessage) \ - ((void *) &RndisMessage->Message) +#define RNDIS_MESSAGE_PTR_TO_MESSAGE_PTR (rndis_msg) \ + ((void *) &rndis_msg->msg)/* get pointer to contained message from NDIS_MESSAGE pointer */ -#define RNDIS_MESSAGE_RAW_PTR_TO_MESSAGE_PTR (RndisMessage) \ - ((void *) RndisMessage) +#define RNDIS_MESSAGE_RAW_PTR_TO_MESSAGE_PTR (rndis_msg) \ + ((void *) rndis_msg)#endif /* _RNDIS_H_ */
drivers/staging/hv/rndis_filter.c +102 -102
407 lines not on this page · raw message
Signature · 1 line
1.6.3.2