diff options
author | Haiyang Zhang <haiyangz@microsoft.com> | 2010-12-10 15:03:57 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-13 13:31:51 -0500 |
commit | 9c26aa0d763a8390177f50ae841148706a249793 (patch) | |
tree | c91190b4fc220115314b2777991f2a10cfe22245 /drivers/staging | |
parent | c2a4efddc73bfd44479fc8d84dadbb352c4efb07 (diff) |
staging: hv: Convert camel cased functions in rndis_filter.c 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')
-rw-r--r-- | drivers/staging/hv/netvsc.c | 2 | ||||
-rw-r--r-- | drivers/staging/hv/netvsc_api.h | 4 | ||||
-rw-r--r-- | drivers/staging/hv/netvsc_drv.c | 4 | ||||
-rw-r--r-- | drivers/staging/hv/rndis_filter.c | 132 | ||||
-rw-r--r-- | drivers/staging/hv/rndis_filter.h | 2 |
5 files changed, 72 insertions, 72 deletions
diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c index 781d7bd37102..5c327fc0d1fd 100644 --- a/drivers/staging/hv/netvsc.c +++ b/drivers/staging/hv/netvsc.c | |||
@@ -202,7 +202,7 @@ int netvsc_initialize(struct hv_driver *drv) | |||
202 | 202 | ||
203 | driver->OnSend = netvsc_send; | 203 | driver->OnSend = netvsc_send; |
204 | 204 | ||
205 | RndisFilterInit(driver); | 205 | rndis_filter_init(driver); |
206 | return 0; | 206 | return 0; |
207 | } | 207 | } |
208 | 208 | ||
diff --git a/drivers/staging/hv/netvsc_api.h b/drivers/staging/hv/netvsc_api.h index dbf154acd967..315271d69914 100644 --- a/drivers/staging/hv/netvsc_api.h +++ b/drivers/staging/hv/netvsc_api.h | |||
@@ -110,7 +110,7 @@ struct netvsc_device_info { | |||
110 | 110 | ||
111 | /* Interface */ | 111 | /* Interface */ |
112 | int netvsc_initialize(struct hv_driver *drv); | 112 | int netvsc_initialize(struct hv_driver *drv); |
113 | int RndisFilterOnOpen(struct hv_device *Device); | 113 | int rndis_filter_open(struct hv_device *dev); |
114 | int RndisFilterOnClose(struct hv_device *Device); | 114 | int rndis_filter_close(struct hv_device *dev); |
115 | 115 | ||
116 | #endif /* _NETVSC_API_H_ */ | 116 | #endif /* _NETVSC_API_H_ */ |
diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c index cd3eef04e59e..e47681e7be82 100644 --- a/drivers/staging/hv/netvsc_drv.c +++ b/drivers/staging/hv/netvsc_drv.c | |||
@@ -81,7 +81,7 @@ static int netvsc_open(struct net_device *net) | |||
81 | 81 | ||
82 | if (netif_carrier_ok(net)) { | 82 | if (netif_carrier_ok(net)) { |
83 | /* Open up the device */ | 83 | /* Open up the device */ |
84 | ret = RndisFilterOnOpen(device_obj); | 84 | ret = rndis_filter_open(device_obj); |
85 | if (ret != 0) { | 85 | if (ret != 0) { |
86 | DPRINT_ERR(NETVSC_DRV, | 86 | DPRINT_ERR(NETVSC_DRV, |
87 | "unable to open device (ret %d).", ret); | 87 | "unable to open device (ret %d).", ret); |
@@ -104,7 +104,7 @@ static int netvsc_close(struct net_device *net) | |||
104 | 104 | ||
105 | netif_stop_queue(net); | 105 | netif_stop_queue(net); |
106 | 106 | ||
107 | ret = RndisFilterOnClose(device_obj); | 107 | ret = rndis_filter_close(device_obj); |
108 | if (ret != 0) | 108 | if (ret != 0) |
109 | DPRINT_ERR(NETVSC_DRV, "unable to close device (ret %d).", ret); | 109 | DPRINT_ERR(NETVSC_DRV, "unable to close device (ret %d).", ret); |
110 | 110 | ||
diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/staging/hv/rndis_filter.c index 28b7e7e59f0a..e560f380adb5 100644 --- a/drivers/staging/hv/rndis_filter.c +++ b/drivers/staging/hv/rndis_filter.c | |||
@@ -81,25 +81,25 @@ struct rndis_filter_packet { | |||
81 | }; | 81 | }; |
82 | 82 | ||
83 | 83 | ||
84 | static int RndisFilterOnDeviceAdd(struct hv_device *dev, | 84 | static int rndis_filte_device_add(struct hv_device *dev, |
85 | void *additional_info); | 85 | void *additional_info); |
86 | 86 | ||
87 | static int RndisFilterOnDeviceRemove(struct hv_device *dev); | 87 | static int rndis_filter_device_remove(struct hv_device *dev); |
88 | 88 | ||
89 | static void RndisFilterOnCleanup(struct hv_driver *drv); | 89 | static void rndis_filter_cleanup(struct hv_driver *drv); |
90 | 90 | ||
91 | static int RndisFilterOnSend(struct hv_device *dev, | 91 | static int rndis_filter_send(struct hv_device *dev, |
92 | struct hv_netvsc_packet *pkt); | 92 | struct hv_netvsc_packet *pkt); |
93 | 93 | ||
94 | static void RndisFilterOnSendCompletion(void *ctx); | 94 | static void rndis_filter_send_completion(void *ctx); |
95 | 95 | ||
96 | static void RndisFilterOnSendRequestCompletion(void *ctx); | 96 | static void rndis_filter_send_request_completion(void *ctx); |
97 | 97 | ||
98 | 98 | ||
99 | /* The one and only */ | 99 | /* The one and only */ |
100 | static struct rndis_filter_driver_object rndis_filter; | 100 | static struct rndis_filter_driver_object rndis_filter; |
101 | 101 | ||
102 | static struct rndis_device *GetRndisDevice(void) | 102 | static struct rndis_device *get_rndis_device(void) |
103 | { | 103 | { |
104 | struct rndis_device *device; | 104 | struct rndis_device *device; |
105 | 105 | ||
@@ -116,7 +116,7 @@ static struct rndis_device *GetRndisDevice(void) | |||
116 | return device; | 116 | return device; |
117 | } | 117 | } |
118 | 118 | ||
119 | static struct rndis_request *GetRndisRequest(struct rndis_device *dev, | 119 | static struct rndis_request *get_rndis_request(struct rndis_device *dev, |
120 | u32 msg_type, | 120 | u32 msg_type, |
121 | u32 msg_len) | 121 | u32 msg_len) |
122 | { | 122 | { |
@@ -155,7 +155,7 @@ static struct rndis_request *GetRndisRequest(struct rndis_device *dev, | |||
155 | return request; | 155 | return request; |
156 | } | 156 | } |
157 | 157 | ||
158 | static void PutRndisRequest(struct rndis_device *dev, | 158 | static void put_rndis_request(struct rndis_device *dev, |
159 | struct rndis_request *req) | 159 | struct rndis_request *req) |
160 | { | 160 | { |
161 | unsigned long flags; | 161 | unsigned long flags; |
@@ -168,7 +168,7 @@ static void PutRndisRequest(struct rndis_device *dev, | |||
168 | kfree(req); | 168 | kfree(req); |
169 | } | 169 | } |
170 | 170 | ||
171 | static void DumpRndisMessage(struct rndis_message *rndis_msg) | 171 | static void dump_rndis_message(struct rndis_message *rndis_msg) |
172 | { | 172 | { |
173 | switch (rndis_msg->NdisMessageType) { | 173 | switch (rndis_msg->NdisMessageType) { |
174 | case REMOTE_NDIS_PACKET_MSG: | 174 | case REMOTE_NDIS_PACKET_MSG: |
@@ -242,7 +242,7 @@ static void DumpRndisMessage(struct rndis_message *rndis_msg) | |||
242 | } | 242 | } |
243 | } | 243 | } |
244 | 244 | ||
245 | static int RndisFilterSendRequest(struct rndis_device *dev, | 245 | static int rndis_filter_send_request(struct rndis_device *dev, |
246 | struct rndis_request *req) | 246 | struct rndis_request *req) |
247 | { | 247 | { |
248 | int ret; | 248 | int ret; |
@@ -263,14 +263,14 @@ static int RndisFilterSendRequest(struct rndis_device *dev, | |||
263 | 263 | ||
264 | packet->Completion.Send.SendCompletionContext = req;/* packet; */ | 264 | packet->Completion.Send.SendCompletionContext = req;/* packet; */ |
265 | packet->Completion.Send.OnSendCompletion = | 265 | packet->Completion.Send.OnSendCompletion = |
266 | RndisFilterOnSendRequestCompletion; | 266 | rndis_filter_send_request_completion; |
267 | packet->Completion.Send.SendCompletionTid = (unsigned long)dev; | 267 | packet->Completion.Send.SendCompletionTid = (unsigned long)dev; |
268 | 268 | ||
269 | ret = rndis_filter.inner_drv.OnSend(dev->net_dev->Device, packet); | 269 | ret = rndis_filter.inner_drv.OnSend(dev->net_dev->Device, packet); |
270 | return ret; | 270 | return ret; |
271 | } | 271 | } |
272 | 272 | ||
273 | static void RndisFilterReceiveResponse(struct rndis_device *dev, | 273 | static void rndis_filter_receive_response(struct rndis_device *dev, |
274 | struct rndis_message *resp) | 274 | struct rndis_message *resp) |
275 | { | 275 | { |
276 | struct rndis_request *request = NULL; | 276 | struct rndis_request *request = NULL; |
@@ -330,7 +330,7 @@ static void RndisFilterReceiveResponse(struct rndis_device *dev, | |||
330 | } | 330 | } |
331 | } | 331 | } |
332 | 332 | ||
333 | static void RndisFilterReceiveIndicateStatus(struct rndis_device *dev, | 333 | static void rndis_filter_receive_indicate_status(struct rndis_device *dev, |
334 | struct rndis_message *resp) | 334 | struct rndis_message *resp) |
335 | { | 335 | { |
336 | struct rndis_indicate_status *indicate = | 336 | struct rndis_indicate_status *indicate = |
@@ -349,7 +349,7 @@ static void RndisFilterReceiveIndicateStatus(struct rndis_device *dev, | |||
349 | } | 349 | } |
350 | } | 350 | } |
351 | 351 | ||
352 | static void RndisFilterReceiveData(struct rndis_device *dev, | 352 | static void rndis_filter_receive_data(struct rndis_device *dev, |
353 | struct rndis_message *msg, | 353 | struct rndis_message *msg, |
354 | struct hv_netvsc_packet *pkt) | 354 | struct hv_netvsc_packet *pkt) |
355 | { | 355 | { |
@@ -380,7 +380,7 @@ static void RndisFilterReceiveData(struct rndis_device *dev, | |||
380 | pkt); | 380 | pkt); |
381 | } | 381 | } |
382 | 382 | ||
383 | static int RndisFilterOnReceive(struct hv_device *dev, | 383 | static int rndis_filter_receive(struct hv_device *dev, |
384 | struct hv_netvsc_packet *pkt) | 384 | struct hv_netvsc_packet *pkt) |
385 | { | 385 | { |
386 | struct netvsc_device *net_dev = dev->Extension; | 386 | struct netvsc_device *net_dev = dev->Extension; |
@@ -445,12 +445,12 @@ static int RndisFilterOnReceive(struct hv_device *dev, | |||
445 | 445 | ||
446 | kunmap_atomic(rndis_hdr - pkt->PageBuffers[0].Offset, KM_IRQ0); | 446 | kunmap_atomic(rndis_hdr - pkt->PageBuffers[0].Offset, KM_IRQ0); |
447 | 447 | ||
448 | DumpRndisMessage(&rndis_msg); | 448 | dump_rndis_message(&rndis_msg); |
449 | 449 | ||
450 | switch (rndis_msg.NdisMessageType) { | 450 | switch (rndis_msg.NdisMessageType) { |
451 | case REMOTE_NDIS_PACKET_MSG: | 451 | case REMOTE_NDIS_PACKET_MSG: |
452 | /* data msg */ | 452 | /* data msg */ |
453 | RndisFilterReceiveData(rndis_dev, &rndis_msg, pkt); | 453 | rndis_filter_receive_data(rndis_dev, &rndis_msg, pkt); |
454 | break; | 454 | break; |
455 | 455 | ||
456 | case REMOTE_NDIS_INITIALIZE_CMPLT: | 456 | case REMOTE_NDIS_INITIALIZE_CMPLT: |
@@ -459,12 +459,12 @@ static int RndisFilterOnReceive(struct hv_device *dev, | |||
459 | /* case REMOTE_NDIS_RESET_CMPLT: */ | 459 | /* case REMOTE_NDIS_RESET_CMPLT: */ |
460 | /* case REMOTE_NDIS_KEEPALIVE_CMPLT: */ | 460 | /* case REMOTE_NDIS_KEEPALIVE_CMPLT: */ |
461 | /* completion msgs */ | 461 | /* completion msgs */ |
462 | RndisFilterReceiveResponse(rndis_dev, &rndis_msg); | 462 | rndis_filter_receive_response(rndis_dev, &rndis_msg); |
463 | break; | 463 | break; |
464 | 464 | ||
465 | case REMOTE_NDIS_INDICATE_STATUS_MSG: | 465 | case REMOTE_NDIS_INDICATE_STATUS_MSG: |
466 | /* notification msgs */ | 466 | /* notification msgs */ |
467 | RndisFilterReceiveIndicateStatus(rndis_dev, &rndis_msg); | 467 | rndis_filter_receive_indicate_status(rndis_dev, &rndis_msg); |
468 | break; | 468 | break; |
469 | default: | 469 | default: |
470 | DPRINT_ERR(NETVSC, "unhandled rndis message (type %u len %u)", | 470 | DPRINT_ERR(NETVSC, "unhandled rndis message (type %u len %u)", |
@@ -476,7 +476,7 @@ static int RndisFilterOnReceive(struct hv_device *dev, | |||
476 | return 0; | 476 | return 0; |
477 | } | 477 | } |
478 | 478 | ||
479 | static int RndisFilterQueryDevice(struct rndis_device *dev, u32 oid, | 479 | static int rndis_filter_query_device(struct rndis_device *dev, u32 oid, |
480 | void *result, u32 *result_size) | 480 | void *result, u32 *result_size) |
481 | { | 481 | { |
482 | struct rndis_request *request; | 482 | struct rndis_request *request; |
@@ -489,7 +489,7 @@ static int RndisFilterQueryDevice(struct rndis_device *dev, u32 oid, | |||
489 | return -EINVAL; | 489 | return -EINVAL; |
490 | 490 | ||
491 | *result_size = 0; | 491 | *result_size = 0; |
492 | request = GetRndisRequest(dev, REMOTE_NDIS_QUERY_MSG, | 492 | request = get_rndis_request(dev, REMOTE_NDIS_QUERY_MSG, |
493 | RNDIS_MESSAGE_SIZE(struct rndis_query_request)); | 493 | RNDIS_MESSAGE_SIZE(struct rndis_query_request)); |
494 | if (!request) { | 494 | if (!request) { |
495 | ret = -1; | 495 | ret = -1; |
@@ -503,7 +503,7 @@ static int RndisFilterQueryDevice(struct rndis_device *dev, u32 oid, | |||
503 | query->InformationBufferLength = 0; | 503 | query->InformationBufferLength = 0; |
504 | query->DeviceVcHandle = 0; | 504 | query->DeviceVcHandle = 0; |
505 | 505 | ||
506 | ret = RndisFilterSendRequest(dev, request); | 506 | ret = rndis_filter_send_request(dev, request); |
507 | if (ret != 0) | 507 | if (ret != 0) |
508 | goto Cleanup; | 508 | goto Cleanup; |
509 | 509 | ||
@@ -526,30 +526,30 @@ static int RndisFilterQueryDevice(struct rndis_device *dev, u32 oid, | |||
526 | 526 | ||
527 | Cleanup: | 527 | Cleanup: |
528 | if (request) | 528 | if (request) |
529 | PutRndisRequest(dev, request); | 529 | put_rndis_request(dev, request); |
530 | 530 | ||
531 | return ret; | 531 | return ret; |
532 | } | 532 | } |
533 | 533 | ||
534 | static int RndisFilterQueryDeviceMac(struct rndis_device *dev) | 534 | static int rndis_filter_query_device_mac(struct rndis_device *dev) |
535 | { | 535 | { |
536 | u32 size = ETH_ALEN; | 536 | u32 size = ETH_ALEN; |
537 | 537 | ||
538 | return RndisFilterQueryDevice(dev, | 538 | return rndis_filter_query_device(dev, |
539 | RNDIS_OID_802_3_PERMANENT_ADDRESS, | 539 | RNDIS_OID_802_3_PERMANENT_ADDRESS, |
540 | dev->hw_mac_adr, &size); | 540 | dev->hw_mac_adr, &size); |
541 | } | 541 | } |
542 | 542 | ||
543 | static int RndisFilterQueryDeviceLinkStatus(struct rndis_device *dev) | 543 | static int rndis_filter_query_device_link_status(struct rndis_device *dev) |
544 | { | 544 | { |
545 | u32 size = sizeof(u32); | 545 | u32 size = sizeof(u32); |
546 | 546 | ||
547 | return RndisFilterQueryDevice(dev, | 547 | return rndis_filter_query_device(dev, |
548 | RNDIS_OID_GEN_MEDIA_CONNECT_STATUS, | 548 | RNDIS_OID_GEN_MEDIA_CONNECT_STATUS, |
549 | &dev->link_stat, &size); | 549 | &dev->link_stat, &size); |
550 | } | 550 | } |
551 | 551 | ||
552 | static int RndisFilterSetPacketFilter(struct rndis_device *dev, | 552 | static int rndis_filter_set_packet_filter(struct rndis_device *dev, |
553 | u32 new_filter) | 553 | u32 new_filter) |
554 | { | 554 | { |
555 | struct rndis_request *request; | 555 | struct rndis_request *request; |
@@ -561,7 +561,7 @@ static int RndisFilterSetPacketFilter(struct rndis_device *dev, | |||
561 | /* ASSERT(RNDIS_MESSAGE_SIZE(struct rndis_set_request) + sizeof(u32) <= */ | 561 | /* ASSERT(RNDIS_MESSAGE_SIZE(struct rndis_set_request) + sizeof(u32) <= */ |
562 | /* sizeof(struct rndis_message)); */ | 562 | /* sizeof(struct rndis_message)); */ |
563 | 563 | ||
564 | request = GetRndisRequest(dev, REMOTE_NDIS_SET_MSG, | 564 | request = get_rndis_request(dev, REMOTE_NDIS_SET_MSG, |
565 | RNDIS_MESSAGE_SIZE(struct rndis_set_request) + | 565 | RNDIS_MESSAGE_SIZE(struct rndis_set_request) + |
566 | sizeof(u32)); | 566 | sizeof(u32)); |
567 | if (!request) { | 567 | if (!request) { |
@@ -578,7 +578,7 @@ static int RndisFilterSetPacketFilter(struct rndis_device *dev, | |||
578 | memcpy((void *)(unsigned long)set + sizeof(struct rndis_set_request), | 578 | memcpy((void *)(unsigned long)set + sizeof(struct rndis_set_request), |
579 | &new_filter, sizeof(u32)); | 579 | &new_filter, sizeof(u32)); |
580 | 580 | ||
581 | ret = RndisFilterSendRequest(dev, request); | 581 | ret = rndis_filter_send_request(dev, request); |
582 | if (ret != 0) | 582 | if (ret != 0) |
583 | goto Cleanup; | 583 | goto Cleanup; |
584 | 584 | ||
@@ -600,12 +600,12 @@ static int RndisFilterSetPacketFilter(struct rndis_device *dev, | |||
600 | 600 | ||
601 | Cleanup: | 601 | Cleanup: |
602 | if (request) | 602 | if (request) |
603 | PutRndisRequest(dev, request); | 603 | put_rndis_request(dev, request); |
604 | Exit: | 604 | Exit: |
605 | return ret; | 605 | return ret; |
606 | } | 606 | } |
607 | 607 | ||
608 | int RndisFilterInit(struct netvsc_driver *drv) | 608 | int rndis_filter_init(struct netvsc_driver *drv) |
609 | { | 609 | { |
610 | DPRINT_DBG(NETVSC, "sizeof(struct rndis_filter_packet) == %zd", | 610 | DPRINT_DBG(NETVSC, "sizeof(struct rndis_filter_packet) == %zd", |
611 | sizeof(struct rndis_filter_packet)); | 611 | sizeof(struct rndis_filter_packet)); |
@@ -635,17 +635,17 @@ int RndisFilterInit(struct netvsc_driver *drv) | |||
635 | drv->OnLinkStatusChanged; | 635 | drv->OnLinkStatusChanged; |
636 | 636 | ||
637 | /* Override */ | 637 | /* Override */ |
638 | drv->Base.OnDeviceAdd = RndisFilterOnDeviceAdd; | 638 | drv->Base.OnDeviceAdd = rndis_filte_device_add; |
639 | drv->Base.OnDeviceRemove = RndisFilterOnDeviceRemove; | 639 | drv->Base.OnDeviceRemove = rndis_filter_device_remove; |
640 | drv->Base.OnCleanup = RndisFilterOnCleanup; | 640 | drv->Base.OnCleanup = rndis_filter_cleanup; |
641 | drv->OnSend = RndisFilterOnSend; | 641 | drv->OnSend = rndis_filter_send; |
642 | /* Driver->QueryLinkStatus = RndisFilterQueryDeviceLinkStatus; */ | 642 | /* Driver->QueryLinkStatus = RndisFilterQueryDeviceLinkStatus; */ |
643 | drv->OnReceiveCallback = RndisFilterOnReceive; | 643 | drv->OnReceiveCallback = rndis_filter_receive; |
644 | 644 | ||
645 | return 0; | 645 | return 0; |
646 | } | 646 | } |
647 | 647 | ||
648 | static int RndisFilterInitDevice(struct rndis_device *dev) | 648 | static int rndis_filter_init_device(struct rndis_device *dev) |
649 | { | 649 | { |
650 | struct rndis_request *request; | 650 | struct rndis_request *request; |
651 | struct rndis_initialize_request *init; | 651 | struct rndis_initialize_request *init; |
@@ -653,7 +653,7 @@ static int RndisFilterInitDevice(struct rndis_device *dev) | |||
653 | u32 status; | 653 | u32 status; |
654 | int ret; | 654 | int ret; |
655 | 655 | ||
656 | request = GetRndisRequest(dev, REMOTE_NDIS_INITIALIZE_MSG, | 656 | request = get_rndis_request(dev, REMOTE_NDIS_INITIALIZE_MSG, |
657 | RNDIS_MESSAGE_SIZE(struct rndis_initialize_request)); | 657 | RNDIS_MESSAGE_SIZE(struct rndis_initialize_request)); |
658 | if (!request) { | 658 | if (!request) { |
659 | ret = -1; | 659 | ret = -1; |
@@ -669,7 +669,7 @@ static int RndisFilterInitDevice(struct rndis_device *dev) | |||
669 | 669 | ||
670 | dev->state = RNDIS_DEV_INITIALIZING; | 670 | dev->state = RNDIS_DEV_INITIALIZING; |
671 | 671 | ||
672 | ret = RndisFilterSendRequest(dev, request); | 672 | ret = rndis_filter_send_request(dev, request); |
673 | if (ret != 0) { | 673 | if (ret != 0) { |
674 | dev->state = RNDIS_DEV_UNINITIALIZED; | 674 | dev->state = RNDIS_DEV_UNINITIALIZED; |
675 | goto Cleanup; | 675 | goto Cleanup; |
@@ -689,18 +689,18 @@ static int RndisFilterInitDevice(struct rndis_device *dev) | |||
689 | 689 | ||
690 | Cleanup: | 690 | Cleanup: |
691 | if (request) | 691 | if (request) |
692 | PutRndisRequest(dev, request); | 692 | put_rndis_request(dev, request); |
693 | 693 | ||
694 | return ret; | 694 | return ret; |
695 | } | 695 | } |
696 | 696 | ||
697 | static void RndisFilterHaltDevice(struct rndis_device *dev) | 697 | static void rndis_filter_halt_device(struct rndis_device *dev) |
698 | { | 698 | { |
699 | struct rndis_request *request; | 699 | struct rndis_request *request; |
700 | struct rndis_halt_request *halt; | 700 | struct rndis_halt_request *halt; |
701 | 701 | ||
702 | /* Attempt to do a rndis device halt */ | 702 | /* Attempt to do a rndis device halt */ |
703 | request = GetRndisRequest(dev, REMOTE_NDIS_HALT_MSG, | 703 | request = get_rndis_request(dev, REMOTE_NDIS_HALT_MSG, |
704 | RNDIS_MESSAGE_SIZE(struct rndis_halt_request)); | 704 | RNDIS_MESSAGE_SIZE(struct rndis_halt_request)); |
705 | if (!request) | 705 | if (!request) |
706 | goto Cleanup; | 706 | goto Cleanup; |
@@ -710,24 +710,24 @@ static void RndisFilterHaltDevice(struct rndis_device *dev) | |||
710 | halt->RequestId = atomic_inc_return(&dev->new_req_id); | 710 | halt->RequestId = atomic_inc_return(&dev->new_req_id); |
711 | 711 | ||
712 | /* Ignore return since this msg is optional. */ | 712 | /* Ignore return since this msg is optional. */ |
713 | RndisFilterSendRequest(dev, request); | 713 | rndis_filter_send_request(dev, request); |
714 | 714 | ||
715 | dev->state = RNDIS_DEV_UNINITIALIZED; | 715 | dev->state = RNDIS_DEV_UNINITIALIZED; |
716 | 716 | ||
717 | Cleanup: | 717 | Cleanup: |
718 | if (request) | 718 | if (request) |
719 | PutRndisRequest(dev, request); | 719 | put_rndis_request(dev, request); |
720 | return; | 720 | return; |
721 | } | 721 | } |
722 | 722 | ||
723 | static int RndisFilterOpenDevice(struct rndis_device *dev) | 723 | static int rndis_filter_open_device(struct rndis_device *dev) |
724 | { | 724 | { |
725 | int ret; | 725 | int ret; |
726 | 726 | ||
727 | if (dev->state != RNDIS_DEV_INITIALIZED) | 727 | if (dev->state != RNDIS_DEV_INITIALIZED) |
728 | return 0; | 728 | return 0; |
729 | 729 | ||
730 | ret = RndisFilterSetPacketFilter(dev, | 730 | ret = rndis_filter_set_packet_filter(dev, |
731 | NDIS_PACKET_TYPE_BROADCAST | | 731 | NDIS_PACKET_TYPE_BROADCAST | |
732 | NDIS_PACKET_TYPE_ALL_MULTICAST | | 732 | NDIS_PACKET_TYPE_ALL_MULTICAST | |
733 | NDIS_PACKET_TYPE_DIRECTED); | 733 | NDIS_PACKET_TYPE_DIRECTED); |
@@ -737,21 +737,21 @@ static int RndisFilterOpenDevice(struct rndis_device *dev) | |||
737 | return ret; | 737 | return ret; |
738 | } | 738 | } |
739 | 739 | ||
740 | static int RndisFilterCloseDevice(struct rndis_device *dev) | 740 | static int rndis_filter_close_device(struct rndis_device *dev) |
741 | { | 741 | { |
742 | int ret; | 742 | int ret; |
743 | 743 | ||
744 | if (dev->state != RNDIS_DEV_DATAINITIALIZED) | 744 | if (dev->state != RNDIS_DEV_DATAINITIALIZED) |
745 | return 0; | 745 | return 0; |
746 | 746 | ||
747 | ret = RndisFilterSetPacketFilter(dev, 0); | 747 | ret = rndis_filter_set_packet_filter(dev, 0); |
748 | if (ret == 0) | 748 | if (ret == 0) |
749 | dev->state = RNDIS_DEV_INITIALIZED; | 749 | dev->state = RNDIS_DEV_INITIALIZED; |
750 | 750 | ||
751 | return ret; | 751 | return ret; |
752 | } | 752 | } |
753 | 753 | ||
754 | static int RndisFilterOnDeviceAdd(struct hv_device *dev, | 754 | static int rndis_filte_device_add(struct hv_device *dev, |
755 | void *additional_info) | 755 | void *additional_info) |
756 | { | 756 | { |
757 | int ret; | 757 | int ret; |
@@ -759,7 +759,7 @@ static int RndisFilterOnDeviceAdd(struct hv_device *dev, | |||
759 | struct rndis_device *rndisDevice; | 759 | struct rndis_device *rndisDevice; |
760 | struct netvsc_device_info *deviceInfo = additional_info; | 760 | struct netvsc_device_info *deviceInfo = additional_info; |
761 | 761 | ||
762 | rndisDevice = GetRndisDevice(); | 762 | rndisDevice = get_rndis_device(); |
763 | if (!rndisDevice) | 763 | if (!rndisDevice) |
764 | return -1; | 764 | return -1; |
765 | 765 | ||
@@ -786,7 +786,7 @@ static int RndisFilterOnDeviceAdd(struct hv_device *dev, | |||
786 | rndisDevice->net_dev = netDevice; | 786 | rndisDevice->net_dev = netDevice; |
787 | 787 | ||
788 | /* Send the rndis initialization message */ | 788 | /* Send the rndis initialization message */ |
789 | ret = RndisFilterInitDevice(rndisDevice); | 789 | ret = rndis_filter_init_device(rndisDevice); |
790 | if (ret != 0) { | 790 | if (ret != 0) { |
791 | /* | 791 | /* |
792 | * TODO: If rndis init failed, we will need to shut down the | 792 | * TODO: If rndis init failed, we will need to shut down the |
@@ -795,7 +795,7 @@ static int RndisFilterOnDeviceAdd(struct hv_device *dev, | |||
795 | } | 795 | } |
796 | 796 | ||
797 | /* Get the mac address */ | 797 | /* Get the mac address */ |
798 | ret = RndisFilterQueryDeviceMac(rndisDevice); | 798 | ret = rndis_filter_query_device_mac(rndisDevice); |
799 | if (ret != 0) { | 799 | if (ret != 0) { |
800 | /* | 800 | /* |
801 | * TODO: shutdown rndis device and the channel | 801 | * TODO: shutdown rndis device and the channel |
@@ -807,7 +807,7 @@ static int RndisFilterOnDeviceAdd(struct hv_device *dev, | |||
807 | 807 | ||
808 | memcpy(deviceInfo->MacAddr, rndisDevice->hw_mac_adr, ETH_ALEN); | 808 | memcpy(deviceInfo->MacAddr, rndisDevice->hw_mac_adr, ETH_ALEN); |
809 | 809 | ||
810 | RndisFilterQueryDeviceLinkStatus(rndisDevice); | 810 | rndis_filter_query_device_link_status(rndisDevice); |
811 | 811 | ||
812 | deviceInfo->LinkState = rndisDevice->link_stat; | 812 | deviceInfo->LinkState = rndisDevice->link_stat; |
813 | DPRINT_INFO(NETVSC, "Device 0x%p link state %s", rndisDevice, | 813 | DPRINT_INFO(NETVSC, "Device 0x%p link state %s", rndisDevice, |
@@ -816,13 +816,13 @@ static int RndisFilterOnDeviceAdd(struct hv_device *dev, | |||
816 | return ret; | 816 | return ret; |
817 | } | 817 | } |
818 | 818 | ||
819 | static int RndisFilterOnDeviceRemove(struct hv_device *dev) | 819 | static int rndis_filter_device_remove(struct hv_device *dev) |
820 | { | 820 | { |
821 | struct netvsc_device *net_dev = dev->Extension; | 821 | struct netvsc_device *net_dev = dev->Extension; |
822 | struct rndis_device *rndis_dev = net_dev->Extension; | 822 | struct rndis_device *rndis_dev = net_dev->Extension; |
823 | 823 | ||
824 | /* Halt and release the rndis device */ | 824 | /* Halt and release the rndis device */ |
825 | RndisFilterHaltDevice(rndis_dev); | 825 | rndis_filter_halt_device(rndis_dev); |
826 | 826 | ||
827 | kfree(rndis_dev); | 827 | kfree(rndis_dev); |
828 | net_dev->Extension = NULL; | 828 | net_dev->Extension = NULL; |
@@ -833,31 +833,31 @@ static int RndisFilterOnDeviceRemove(struct hv_device *dev) | |||
833 | return 0; | 833 | return 0; |
834 | } | 834 | } |
835 | 835 | ||
836 | static void RndisFilterOnCleanup(struct hv_driver *drv) | 836 | static void rndis_filter_cleanup(struct hv_driver *drv) |
837 | { | 837 | { |
838 | } | 838 | } |
839 | 839 | ||
840 | int RndisFilterOnOpen(struct hv_device *dev) | 840 | int rndis_filter_open(struct hv_device *dev) |
841 | { | 841 | { |
842 | struct netvsc_device *netDevice = dev->Extension; | 842 | struct netvsc_device *netDevice = dev->Extension; |
843 | 843 | ||
844 | if (!netDevice) | 844 | if (!netDevice) |
845 | return -EINVAL; | 845 | return -EINVAL; |
846 | 846 | ||
847 | return RndisFilterOpenDevice(netDevice->Extension); | 847 | return rndis_filter_open_device(netDevice->Extension); |
848 | } | 848 | } |
849 | 849 | ||
850 | int RndisFilterOnClose(struct hv_device *dev) | 850 | int rndis_filter_close(struct hv_device *dev) |
851 | { | 851 | { |
852 | struct netvsc_device *netDevice = dev->Extension; | 852 | struct netvsc_device *netDevice = dev->Extension; |
853 | 853 | ||
854 | if (!netDevice) | 854 | if (!netDevice) |
855 | return -EINVAL; | 855 | return -EINVAL; |
856 | 856 | ||
857 | return RndisFilterCloseDevice(netDevice->Extension); | 857 | return rndis_filter_close_device(netDevice->Extension); |
858 | } | 858 | } |
859 | 859 | ||
860 | static int RndisFilterOnSend(struct hv_device *dev, | 860 | static int rndis_filter_send(struct hv_device *dev, |
861 | struct hv_netvsc_packet *pkt) | 861 | struct hv_netvsc_packet *pkt) |
862 | { | 862 | { |
863 | int ret; | 863 | int ret; |
@@ -895,7 +895,7 @@ static int RndisFilterOnSend(struct hv_device *dev, | |||
895 | pkt->Completion.Send.SendCompletionContext; | 895 | pkt->Completion.Send.SendCompletionContext; |
896 | 896 | ||
897 | /* Use ours */ | 897 | /* Use ours */ |
898 | pkt->Completion.Send.OnSendCompletion = RndisFilterOnSendCompletion; | 898 | pkt->Completion.Send.OnSendCompletion = rndis_filter_send_completion; |
899 | pkt->Completion.Send.SendCompletionContext = filterPacket; | 899 | pkt->Completion.Send.SendCompletionContext = filterPacket; |
900 | 900 | ||
901 | ret = rndis_filter.inner_drv.OnSend(dev, pkt); | 901 | ret = rndis_filter.inner_drv.OnSend(dev, pkt); |
@@ -913,7 +913,7 @@ static int RndisFilterOnSend(struct hv_device *dev, | |||
913 | return ret; | 913 | return ret; |
914 | } | 914 | } |
915 | 915 | ||
916 | static void RndisFilterOnSendCompletion(void *ctx) | 916 | static void rndis_filter_send_completion(void *ctx) |
917 | { | 917 | { |
918 | struct rndis_filter_packet *filterPacket = ctx; | 918 | struct rndis_filter_packet *filterPacket = ctx; |
919 | 919 | ||
@@ -922,7 +922,7 @@ static void RndisFilterOnSendCompletion(void *ctx) | |||
922 | } | 922 | } |
923 | 923 | ||
924 | 924 | ||
925 | static void RndisFilterOnSendRequestCompletion(void *ctx) | 925 | static void rndis_filter_send_request_completion(void *ctx) |
926 | { | 926 | { |
927 | /* Noop */ | 927 | /* Noop */ |
928 | } | 928 | } |
diff --git a/drivers/staging/hv/rndis_filter.h b/drivers/staging/hv/rndis_filter.h index 764b9bf3e5dc..4da18f3cbade 100644 --- a/drivers/staging/hv/rndis_filter.h +++ b/drivers/staging/hv/rndis_filter.h | |||
@@ -50,6 +50,6 @@ | |||
50 | 50 | ||
51 | /* Interface */ | 51 | /* Interface */ |
52 | 52 | ||
53 | extern int RndisFilterInit(struct netvsc_driver *driver); | 53 | extern int rndis_filter_init(struct netvsc_driver *driver); |
54 | 54 | ||
55 | #endif /* _RNDISFILTER_H_ */ | 55 | #endif /* _RNDISFILTER_H_ */ |