diff options
author | Haiyang Zhang <haiyangz@microsoft.com> | 2012-02-05 07:13:08 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-05 17:44:55 -0500 |
commit | 5fccab3b66d53883a97fc65e0c33f3ebf74e8ff9 (patch) | |
tree | d301808531c476be0da10905a8265394d24e78f9 /drivers/net/hyperv | |
parent | d07d4c239bbf428db5581ccd5ca3770bbd15bfbd (diff) |
net/hyperv: Convert camel cased variables in rndis_filter.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Reviewed-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hyperv')
-rw-r--r-- | drivers/net/hyperv/rndis_filter.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c index 133b7fbf8595..a60e5e2e621a 100644 --- a/drivers/net/hyperv/rndis_filter.c +++ b/drivers/net/hyperv/rndis_filter.c | |||
@@ -758,66 +758,66 @@ int rndis_filter_open(struct hv_device *dev) | |||
758 | 758 | ||
759 | int rndis_filter_close(struct hv_device *dev) | 759 | int rndis_filter_close(struct hv_device *dev) |
760 | { | 760 | { |
761 | struct netvsc_device *netDevice = hv_get_drvdata(dev); | 761 | struct netvsc_device *nvdev = hv_get_drvdata(dev); |
762 | 762 | ||
763 | if (!netDevice) | 763 | if (!nvdev) |
764 | return -EINVAL; | 764 | return -EINVAL; |
765 | 765 | ||
766 | return rndis_filter_close_device(netDevice->extension); | 766 | return rndis_filter_close_device(nvdev->extension); |
767 | } | 767 | } |
768 | 768 | ||
769 | int rndis_filter_send(struct hv_device *dev, | 769 | int rndis_filter_send(struct hv_device *dev, |
770 | struct hv_netvsc_packet *pkt) | 770 | struct hv_netvsc_packet *pkt) |
771 | { | 771 | { |
772 | int ret; | 772 | int ret; |
773 | struct rndis_filter_packet *filterPacket; | 773 | struct rndis_filter_packet *filter_pkt; |
774 | struct rndis_message *rndisMessage; | 774 | struct rndis_message *rndis_msg; |
775 | struct rndis_packet *rndisPacket; | 775 | struct rndis_packet *rndis_pkt; |
776 | u32 rndisMessageSize; | 776 | u32 rndis_msg_size; |
777 | 777 | ||
778 | /* Add the rndis header */ | 778 | /* Add the rndis header */ |
779 | filterPacket = (struct rndis_filter_packet *)pkt->extension; | 779 | filter_pkt = (struct rndis_filter_packet *)pkt->extension; |
780 | 780 | ||
781 | memset(filterPacket, 0, sizeof(struct rndis_filter_packet)); | 781 | memset(filter_pkt, 0, sizeof(struct rndis_filter_packet)); |
782 | 782 | ||
783 | rndisMessage = &filterPacket->msg; | 783 | rndis_msg = &filter_pkt->msg; |
784 | rndisMessageSize = RNDIS_MESSAGE_SIZE(struct rndis_packet); | 784 | rndis_msg_size = RNDIS_MESSAGE_SIZE(struct rndis_packet); |
785 | 785 | ||
786 | rndisMessage->ndis_msg_type = REMOTE_NDIS_PACKET_MSG; | 786 | rndis_msg->ndis_msg_type = REMOTE_NDIS_PACKET_MSG; |
787 | rndisMessage->msg_len = pkt->total_data_buflen + | 787 | rndis_msg->msg_len = pkt->total_data_buflen + |
788 | rndisMessageSize; | 788 | rndis_msg_size; |
789 | 789 | ||
790 | rndisPacket = &rndisMessage->msg.pkt; | 790 | rndis_pkt = &rndis_msg->msg.pkt; |
791 | rndisPacket->data_offset = sizeof(struct rndis_packet); | 791 | rndis_pkt->data_offset = sizeof(struct rndis_packet); |
792 | rndisPacket->data_len = pkt->total_data_buflen; | 792 | rndis_pkt->data_len = pkt->total_data_buflen; |
793 | 793 | ||
794 | pkt->is_data_pkt = true; | 794 | pkt->is_data_pkt = true; |
795 | pkt->page_buf[0].pfn = virt_to_phys(rndisMessage) >> PAGE_SHIFT; | 795 | pkt->page_buf[0].pfn = virt_to_phys(rndis_msg) >> PAGE_SHIFT; |
796 | pkt->page_buf[0].offset = | 796 | pkt->page_buf[0].offset = |
797 | (unsigned long)rndisMessage & (PAGE_SIZE-1); | 797 | (unsigned long)rndis_msg & (PAGE_SIZE-1); |
798 | pkt->page_buf[0].len = rndisMessageSize; | 798 | pkt->page_buf[0].len = rndis_msg_size; |
799 | 799 | ||
800 | /* Add one page_buf if the rndis msg goes beyond page boundary */ | 800 | /* Add one page_buf if the rndis msg goes beyond page boundary */ |
801 | if (pkt->page_buf[0].offset + rndisMessageSize > PAGE_SIZE) { | 801 | if (pkt->page_buf[0].offset + rndis_msg_size > PAGE_SIZE) { |
802 | int i; | 802 | int i; |
803 | for (i = pkt->page_buf_cnt; i > 1; i--) | 803 | for (i = pkt->page_buf_cnt; i > 1; i--) |
804 | pkt->page_buf[i] = pkt->page_buf[i-1]; | 804 | pkt->page_buf[i] = pkt->page_buf[i-1]; |
805 | pkt->page_buf_cnt++; | 805 | pkt->page_buf_cnt++; |
806 | pkt->page_buf[0].len = PAGE_SIZE - pkt->page_buf[0].offset; | 806 | pkt->page_buf[0].len = PAGE_SIZE - pkt->page_buf[0].offset; |
807 | pkt->page_buf[1].pfn = virt_to_phys((void *)((ulong) | 807 | pkt->page_buf[1].pfn = virt_to_phys((void *)((ulong) |
808 | rndisMessage + pkt->page_buf[0].len)) >> PAGE_SHIFT; | 808 | rndis_msg + pkt->page_buf[0].len)) >> PAGE_SHIFT; |
809 | pkt->page_buf[1].offset = 0; | 809 | pkt->page_buf[1].offset = 0; |
810 | pkt->page_buf[1].len = rndisMessageSize - pkt->page_buf[0].len; | 810 | pkt->page_buf[1].len = rndis_msg_size - pkt->page_buf[0].len; |
811 | } | 811 | } |
812 | 812 | ||
813 | /* Save the packet send completion and context */ | 813 | /* Save the packet send completion and context */ |
814 | filterPacket->completion = pkt->completion.send.send_completion; | 814 | filter_pkt->completion = pkt->completion.send.send_completion; |
815 | filterPacket->completion_ctx = | 815 | filter_pkt->completion_ctx = |
816 | pkt->completion.send.send_completion_ctx; | 816 | pkt->completion.send.send_completion_ctx; |
817 | 817 | ||
818 | /* Use ours */ | 818 | /* Use ours */ |
819 | pkt->completion.send.send_completion = rndis_filter_send_completion; | 819 | pkt->completion.send.send_completion = rndis_filter_send_completion; |
820 | pkt->completion.send.send_completion_ctx = filterPacket; | 820 | pkt->completion.send.send_completion_ctx = filter_pkt; |
821 | 821 | ||
822 | ret = netvsc_send(dev, pkt); | 822 | ret = netvsc_send(dev, pkt); |
823 | if (ret != 0) { | 823 | if (ret != 0) { |
@@ -826,9 +826,9 @@ int rndis_filter_send(struct hv_device *dev, | |||
826 | * above | 826 | * above |
827 | */ | 827 | */ |
828 | pkt->completion.send.send_completion = | 828 | pkt->completion.send.send_completion = |
829 | filterPacket->completion; | 829 | filter_pkt->completion; |
830 | pkt->completion.send.send_completion_ctx = | 830 | pkt->completion.send.send_completion_ctx = |
831 | filterPacket->completion_ctx; | 831 | filter_pkt->completion_ctx; |
832 | } | 832 | } |
833 | 833 | ||
834 | return ret; | 834 | return ret; |
@@ -836,10 +836,10 @@ int rndis_filter_send(struct hv_device *dev, | |||
836 | 836 | ||
837 | static void rndis_filter_send_completion(void *ctx) | 837 | static void rndis_filter_send_completion(void *ctx) |
838 | { | 838 | { |
839 | struct rndis_filter_packet *filterPacket = ctx; | 839 | struct rndis_filter_packet *filter_pkt = ctx; |
840 | 840 | ||
841 | /* Pass it back to the original handler */ | 841 | /* Pass it back to the original handler */ |
842 | filterPacket->completion(filterPacket->completion_ctx); | 842 | filter_pkt->completion(filter_pkt->completion_ctx); |
843 | } | 843 | } |
844 | 844 | ||
845 | 845 | ||