aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/hv/netvsc.c
diff options
context:
space:
mode:
authorHaiyang Zhang <haiyangz@microsoft.com>2010-12-10 15:03:58 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-13 13:31:51 -0500
commit72a2f5bd53bf83302f4dcfe8500d4ec440545d27 (patch)
tree4e239bcca2cd75eb25fa475e1ee1e4a3f8942e00 /drivers/staging/hv/netvsc.c
parent9c26aa0d763a8390177f50ae841148706a249793 (diff)
staging: hv: Convert camel cased struct fields in netvsc_api.h to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/netvsc.c')
-rw-r--r--drivers/staging/hv/netvsc.c104
1 files changed, 52 insertions, 52 deletions
diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c
index 5c327fc0d1f..d678bf5329e 100644
--- a/drivers/staging/hv/netvsc.c
+++ b/drivers/staging/hv/netvsc.c
@@ -196,11 +196,11 @@ int netvsc_initialize(struct hv_driver *drv)
196 /* ASSERT(driver->OnLinkStatusChanged); */ 196 /* ASSERT(driver->OnLinkStatusChanged); */
197 197
198 /* Setup the dispatch table */ 198 /* Setup the dispatch table */
199 driver->Base.OnDeviceAdd = netvsc_device_add; 199 driver->base.OnDeviceAdd = netvsc_device_add;
200 driver->Base.OnDeviceRemove = netvsc_device_remove; 200 driver->base.OnDeviceRemove = netvsc_device_remove;
201 driver->Base.OnCleanup = netvsc_cleanup; 201 driver->base.OnCleanup = netvsc_cleanup;
202 202
203 driver->OnSend = netvsc_send; 203 driver->send = netvsc_send;
204 204
205 rndis_filter_init(driver); 205 rndis_filter_init(driver);
206 return 0; 206 return 0;
@@ -736,7 +736,7 @@ static int netvsc_device_add(struct hv_device *device, void *additional_info)
736 NETVSC_RECEIVE_PACKETLIST_COUNT, i); 736 NETVSC_RECEIVE_PACKETLIST_COUNT, i);
737 break; 737 break;
738 } 738 }
739 list_add_tail(&packet->ListEntry, 739 list_add_tail(&packet->list_ent,
740 &net_device->ReceivePacketList); 740 &net_device->ReceivePacketList);
741 } 741 }
742 net_device->ChannelInitEvent = osd_waitevent_create(); 742 net_device->ChannelInitEvent = osd_waitevent_create();
@@ -746,8 +746,8 @@ static int netvsc_device_add(struct hv_device *device, void *additional_info)
746 } 746 }
747 747
748 /* Open the channel */ 748 /* Open the channel */
749 ret = vmbus_open(device->channel, net_driver->RingBufferSize, 749 ret = vmbus_open(device->channel, net_driver->ring_buf_size,
750 net_driver->RingBufferSize, NULL, 0, 750 net_driver->ring_buf_size, NULL, 0,
751 netvsc_channel_cb, device); 751 netvsc_channel_cb, device);
752 752
753 if (ret != 0) { 753 if (ret != 0) {
@@ -783,8 +783,8 @@ Cleanup:
783 783
784 list_for_each_entry_safe(packet, pos, 784 list_for_each_entry_safe(packet, pos,
785 &net_device->ReceivePacketList, 785 &net_device->ReceivePacketList,
786 ListEntry) { 786 list_ent) {
787 list_del(&packet->ListEntry); 787 list_del(&packet->list_ent);
788 kfree(packet); 788 kfree(packet);
789 } 789 }
790 790
@@ -840,8 +840,8 @@ static int netvsc_device_remove(struct hv_device *device)
840 840
841 /* Release all resources */ 841 /* Release all resources */
842 list_for_each_entry_safe(netvsc_packet, pos, 842 list_for_each_entry_safe(netvsc_packet, pos,
843 &net_device->ReceivePacketList, ListEntry) { 843 &net_device->ReceivePacketList, list_ent) {
844 list_del(&netvsc_packet->ListEntry); 844 list_del(&netvsc_packet->list_ent);
845 kfree(netvsc_packet); 845 kfree(netvsc_packet);
846 } 846 }
847 847
@@ -894,8 +894,8 @@ static void netvsc_send_completion(struct hv_device *device,
894 /* ASSERT(nvscPacket); */ 894 /* ASSERT(nvscPacket); */
895 895
896 /* Notify the layer above us */ 896 /* Notify the layer above us */
897 nvsc_packet->Completion.Send.OnSendCompletion( 897 nvsc_packet->completion.send.send_completion(
898 nvsc_packet->Completion.Send.SendCompletionContext); 898 nvsc_packet->completion.send.send_completion_ctx);
899 899
900 atomic_dec(&net_device->NumOutstandingSends); 900 atomic_dec(&net_device->NumOutstandingSends);
901 } else { 901 } else {
@@ -922,7 +922,7 @@ static int netvsc_send(struct hv_device *device,
922 } 922 }
923 923
924 sendMessage.Header.MessageType = NvspMessage1TypeSendRNDISPacket; 924 sendMessage.Header.MessageType = NvspMessage1TypeSendRNDISPacket;
925 if (packet->IsDataPacket) { 925 if (packet->is_data_pkt) {
926 /* 0 is RMC_DATA; */ 926 /* 0 is RMC_DATA; */
927 sendMessage.Messages.Version1Messages.SendRNDISPacket.ChannelType = 0; 927 sendMessage.Messages.Version1Messages.SendRNDISPacket.ChannelType = 0;
928 } else { 928 } else {
@@ -934,10 +934,10 @@ static int netvsc_send(struct hv_device *device,
934 sendMessage.Messages.Version1Messages.SendRNDISPacket.SendBufferSectionIndex = 0xFFFFFFFF; 934 sendMessage.Messages.Version1Messages.SendRNDISPacket.SendBufferSectionIndex = 0xFFFFFFFF;
935 sendMessage.Messages.Version1Messages.SendRNDISPacket.SendBufferSectionSize = 0; 935 sendMessage.Messages.Version1Messages.SendRNDISPacket.SendBufferSectionSize = 0;
936 936
937 if (packet->PageBufferCount) { 937 if (packet->page_buf_cnt) {
938 ret = vmbus_sendpacket_pagebuffer(device->channel, 938 ret = vmbus_sendpacket_pagebuffer(device->channel,
939 packet->PageBuffers, 939 packet->page_buf,
940 packet->PageBufferCount, 940 packet->page_buf_cnt,
941 &sendMessage, 941 &sendMessage,
942 sizeof(struct nvsp_message), 942 sizeof(struct nvsp_message),
943 (unsigned long)packet); 943 (unsigned long)packet);
@@ -1063,82 +1063,82 @@ static void netvsc_receive(struct hv_device *device,
1063 1063
1064 /* Remove the 1st packet to represent the xfer page packet itself */ 1064 /* Remove the 1st packet to represent the xfer page packet itself */
1065 xferpage_packet = (struct xferpage_packet *)listHead.next; 1065 xferpage_packet = (struct xferpage_packet *)listHead.next;
1066 list_del(&xferpage_packet->ListEntry); 1066 list_del(&xferpage_packet->list_ent);
1067 1067
1068 /* This is how much we can satisfy */ 1068 /* This is how much we can satisfy */
1069 xferpage_packet->Count = count - 1; 1069 xferpage_packet->count = count - 1;
1070 /* ASSERT(xferpagePacket->Count > 0 && xferpagePacket->Count <= */ 1070 /* ASSERT(xferpagePacket->Count > 0 && xferpagePacket->Count <= */
1071 /* vmxferpagePacket->RangeCount); */ 1071 /* vmxferpagePacket->RangeCount); */
1072 1072
1073 if (xferpage_packet->Count != vmxferpage_packet->RangeCount) { 1073 if (xferpage_packet->count != vmxferpage_packet->RangeCount) {
1074 DPRINT_INFO(NETVSC, "Needed %d netvsc pkts to satisy this xfer " 1074 DPRINT_INFO(NETVSC, "Needed %d netvsc pkts to satisy this xfer "
1075 "page...got %d", vmxferpage_packet->RangeCount, 1075 "page...got %d", vmxferpage_packet->RangeCount,
1076 xferpage_packet->Count); 1076 xferpage_packet->count);
1077 } 1077 }
1078 1078
1079 /* Each range represents 1 RNDIS pkt that contains 1 ethernet frame */ 1079 /* Each range represents 1 RNDIS pkt that contains 1 ethernet frame */
1080 for (i = 0; i < (count - 1); i++) { 1080 for (i = 0; i < (count - 1); i++) {
1081 netvsc_packet = (struct hv_netvsc_packet *)listHead.next; 1081 netvsc_packet = (struct hv_netvsc_packet *)listHead.next;
1082 list_del(&netvsc_packet->ListEntry); 1082 list_del(&netvsc_packet->list_ent);
1083 1083
1084 /* Initialize the netvsc packet */ 1084 /* Initialize the netvsc packet */
1085 netvsc_packet->XferPagePacket = xferpage_packet; 1085 netvsc_packet->xfer_page_pkt = xferpage_packet;
1086 netvsc_packet->Completion.Recv.OnReceiveCompletion = 1086 netvsc_packet->completion.recv.recv_completion =
1087 netvsc_receive_completion; 1087 netvsc_receive_completion;
1088 netvsc_packet->Completion.Recv.ReceiveCompletionContext = 1088 netvsc_packet->completion.recv.recv_completion_ctx =
1089 netvsc_packet; 1089 netvsc_packet;
1090 netvsc_packet->Device = device; 1090 netvsc_packet->device = device;
1091 /* Save this so that we can send it back */ 1091 /* Save this so that we can send it back */
1092 netvsc_packet->Completion.Recv.ReceiveCompletionTid = 1092 netvsc_packet->completion.recv.recv_completion_tid =
1093 vmxferpage_packet->d.TransactionId; 1093 vmxferpage_packet->d.TransactionId;
1094 1094
1095 netvsc_packet->TotalDataBufferLength = 1095 netvsc_packet->total_data_buflen =
1096 vmxferpage_packet->Ranges[i].ByteCount; 1096 vmxferpage_packet->Ranges[i].ByteCount;
1097 netvsc_packet->PageBufferCount = 1; 1097 netvsc_packet->page_buf_cnt = 1;
1098 1098
1099 /* ASSERT(vmxferpagePacket->Ranges[i].ByteOffset + */ 1099 /* ASSERT(vmxferpagePacket->Ranges[i].ByteOffset + */
1100 /* vmxferpagePacket->Ranges[i].ByteCount < */ 1100 /* vmxferpagePacket->Ranges[i].ByteCount < */
1101 /* netDevice->ReceiveBufferSize); */ 1101 /* netDevice->ReceiveBufferSize); */
1102 1102
1103 netvsc_packet->PageBuffers[0].Length = 1103 netvsc_packet->page_buf[0].Length =
1104 vmxferpage_packet->Ranges[i].ByteCount; 1104 vmxferpage_packet->Ranges[i].ByteCount;
1105 1105
1106 start = virt_to_phys((void *)((unsigned long)net_device-> 1106 start = virt_to_phys((void *)((unsigned long)net_device->
1107 ReceiveBuffer + vmxferpage_packet->Ranges[i].ByteOffset)); 1107 ReceiveBuffer + vmxferpage_packet->Ranges[i].ByteOffset));
1108 1108
1109 netvsc_packet->PageBuffers[0].Pfn = start >> PAGE_SHIFT; 1109 netvsc_packet->page_buf[0].Pfn = start >> PAGE_SHIFT;
1110 end_virtual = (unsigned long)net_device->ReceiveBuffer 1110 end_virtual = (unsigned long)net_device->ReceiveBuffer
1111 + vmxferpage_packet->Ranges[i].ByteOffset 1111 + vmxferpage_packet->Ranges[i].ByteOffset
1112 + vmxferpage_packet->Ranges[i].ByteCount - 1; 1112 + vmxferpage_packet->Ranges[i].ByteCount - 1;
1113 end = virt_to_phys((void *)end_virtual); 1113 end = virt_to_phys((void *)end_virtual);
1114 1114
1115 /* Calculate the page relative offset */ 1115 /* Calculate the page relative offset */
1116 netvsc_packet->PageBuffers[0].Offset = 1116 netvsc_packet->page_buf[0].Offset =
1117 vmxferpage_packet->Ranges[i].ByteOffset & 1117 vmxferpage_packet->Ranges[i].ByteOffset &
1118 (PAGE_SIZE - 1); 1118 (PAGE_SIZE - 1);
1119 if ((end >> PAGE_SHIFT) != (start >> PAGE_SHIFT)) { 1119 if ((end >> PAGE_SHIFT) != (start >> PAGE_SHIFT)) {
1120 /* Handle frame across multiple pages: */ 1120 /* Handle frame across multiple pages: */
1121 netvsc_packet->PageBuffers[0].Length = 1121 netvsc_packet->page_buf[0].Length =
1122 (netvsc_packet->PageBuffers[0].Pfn << 1122 (netvsc_packet->page_buf[0].Pfn <<
1123 PAGE_SHIFT) 1123 PAGE_SHIFT)
1124 + PAGE_SIZE - start; 1124 + PAGE_SIZE - start;
1125 bytes_remain = netvsc_packet->TotalDataBufferLength - 1125 bytes_remain = netvsc_packet->total_data_buflen -
1126 netvsc_packet->PageBuffers[0].Length; 1126 netvsc_packet->page_buf[0].Length;
1127 for (j = 1; j < NETVSC_PACKET_MAXPAGE; j++) { 1127 for (j = 1; j < NETVSC_PACKET_MAXPAGE; j++) {
1128 netvsc_packet->PageBuffers[j].Offset = 0; 1128 netvsc_packet->page_buf[j].Offset = 0;
1129 if (bytes_remain <= PAGE_SIZE) { 1129 if (bytes_remain <= PAGE_SIZE) {
1130 netvsc_packet->PageBuffers[j].Length = 1130 netvsc_packet->page_buf[j].Length =
1131 bytes_remain; 1131 bytes_remain;
1132 bytes_remain = 0; 1132 bytes_remain = 0;
1133 } else { 1133 } else {
1134 netvsc_packet->PageBuffers[j].Length = 1134 netvsc_packet->page_buf[j].Length =
1135 PAGE_SIZE; 1135 PAGE_SIZE;
1136 bytes_remain -= PAGE_SIZE; 1136 bytes_remain -= PAGE_SIZE;
1137 } 1137 }
1138 netvsc_packet->PageBuffers[j].Pfn = 1138 netvsc_packet->page_buf[j].Pfn =
1139 virt_to_phys((void *)(end_virtual - 1139 virt_to_phys((void *)(end_virtual -
1140 bytes_remain)) >> PAGE_SHIFT; 1140 bytes_remain)) >> PAGE_SHIFT;
1141 netvsc_packet->PageBufferCount++; 1141 netvsc_packet->page_buf_cnt++;
1142 if (bytes_remain == 0) 1142 if (bytes_remain == 0)
1143 break; 1143 break;
1144 } 1144 }
@@ -1148,16 +1148,16 @@ static void netvsc_receive(struct hv_device *device,
1148 "(pfn %llx, offset %u, len %u)", i, 1148 "(pfn %llx, offset %u, len %u)", i,
1149 vmxferpage_packet->Ranges[i].ByteOffset, 1149 vmxferpage_packet->Ranges[i].ByteOffset,
1150 vmxferpage_packet->Ranges[i].ByteCount, 1150 vmxferpage_packet->Ranges[i].ByteCount,
1151 netvsc_packet->PageBuffers[0].Pfn, 1151 netvsc_packet->page_buf[0].Pfn,
1152 netvsc_packet->PageBuffers[0].Offset, 1152 netvsc_packet->page_buf[0].Offset,
1153 netvsc_packet->PageBuffers[0].Length); 1153 netvsc_packet->page_buf[0].Length);
1154 1154
1155 /* Pass it to the upper layer */ 1155 /* Pass it to the upper layer */
1156 ((struct netvsc_driver *)device->Driver)-> 1156 ((struct netvsc_driver *)device->Driver)->
1157 OnReceiveCallback(device, netvsc_packet); 1157 recv_cb(device, netvsc_packet);
1158 1158
1159 netvsc_receive_completion(netvsc_packet-> 1159 netvsc_receive_completion(netvsc_packet->
1160 Completion.Recv.ReceiveCompletionContext); 1160 completion.recv.recv_completion_ctx);
1161 } 1161 }
1162 1162
1163 /* ASSERT(list_empty(&listHead)); */ 1163 /* ASSERT(list_empty(&listHead)); */
@@ -1213,7 +1213,7 @@ retry_send_cmplt:
1213static void netvsc_receive_completion(void *context) 1213static void netvsc_receive_completion(void *context)
1214{ 1214{
1215 struct hv_netvsc_packet *packet = context; 1215 struct hv_netvsc_packet *packet = context;
1216 struct hv_device *device = (struct hv_device *)packet->Device; 1216 struct hv_device *device = (struct hv_device *)packet->device;
1217 struct netvsc_device *net_device; 1217 struct netvsc_device *net_device;
1218 u64 transaction_id = 0; 1218 u64 transaction_id = 0;
1219 bool fsend_receive_comp = false; 1219 bool fsend_receive_comp = false;
@@ -1237,22 +1237,22 @@ static void netvsc_receive_completion(void *context)
1237 spin_lock_irqsave(&net_device->receive_packet_list_lock, flags); 1237 spin_lock_irqsave(&net_device->receive_packet_list_lock, flags);
1238 1238
1239 /* ASSERT(packet->XferPagePacket->Count > 0); */ 1239 /* ASSERT(packet->XferPagePacket->Count > 0); */
1240 packet->XferPagePacket->Count--; 1240 packet->xfer_page_pkt->count--;
1241 1241
1242 /* 1242 /*
1243 * Last one in the line that represent 1 xfer page packet. 1243 * Last one in the line that represent 1 xfer page packet.
1244 * Return the xfer page packet itself to the freelist 1244 * Return the xfer page packet itself to the freelist
1245 */ 1245 */
1246 if (packet->XferPagePacket->Count == 0) { 1246 if (packet->xfer_page_pkt->count == 0) {
1247 fsend_receive_comp = true; 1247 fsend_receive_comp = true;
1248 transaction_id = packet->Completion.Recv.ReceiveCompletionTid; 1248 transaction_id = packet->completion.recv.recv_completion_tid;
1249 list_add_tail(&packet->XferPagePacket->ListEntry, 1249 list_add_tail(&packet->xfer_page_pkt->list_ent,
1250 &net_device->ReceivePacketList); 1250 &net_device->ReceivePacketList);
1251 1251
1252 } 1252 }
1253 1253
1254 /* Put the packet back */ 1254 /* Put the packet back */
1255 list_add_tail(&packet->ListEntry, &net_device->ReceivePacketList); 1255 list_add_tail(&packet->list_ent, &net_device->ReceivePacketList);
1256 spin_unlock_irqrestore(&net_device->receive_packet_list_lock, flags); 1256 spin_unlock_irqrestore(&net_device->receive_packet_list_lock, flags);
1257 1257
1258 /* Send a receive completion for the xfer page packet */ 1258 /* Send a receive completion for the xfer page packet */