aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/hv/rndis_filter.c
diff options
context:
space:
mode:
authorK. Y. Srinivasan <kys@microsoft.com>2011-09-13 13:59:55 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-09-16 14:06:04 -0400
commitb13cc345b6f7aae293050c33e86f585ea30b2e38 (patch)
tree179523816e01e73f957eb423b7a2462995e50181 /drivers/staging/hv/rndis_filter.c
parent86c921af41f0d40ff9105a73fb20378440f0299f (diff)
Staging: hv: netvsc: Rename rndisDevice to rndis_device
Rename rndisDevice to rndis_device. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/rndis_filter.c')
-rw-r--r--drivers/staging/hv/rndis_filter.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/staging/hv/rndis_filter.c
index efa7df5b1f8..bfe91292e9e 100644
--- a/drivers/staging/hv/rndis_filter.c
+++ b/drivers/staging/hv/rndis_filter.c
@@ -690,11 +690,11 @@ int rndis_filter_device_add(struct hv_device *dev,
690{ 690{
691 int ret; 691 int ret;
692 struct netvsc_device *net_device; 692 struct netvsc_device *net_device;
693 struct rndis_device *rndisDevice; 693 struct rndis_device *rndis_device;
694 struct netvsc_device_info *deviceInfo = additional_info; 694 struct netvsc_device_info *deviceInfo = additional_info;
695 695
696 rndisDevice = get_rndis_device(); 696 rndis_device = get_rndis_device();
697 if (!rndisDevice) 697 if (!rndis_device)
698 return -ENODEV; 698 return -ENODEV;
699 699
700 /* 700 /*
@@ -704,7 +704,7 @@ int rndis_filter_device_add(struct hv_device *dev,
704 */ 704 */
705 ret = netvsc_device_add(dev, additional_info); 705 ret = netvsc_device_add(dev, additional_info);
706 if (ret != 0) { 706 if (ret != 0) {
707 kfree(rndisDevice); 707 kfree(rndis_device);
708 return ret; 708 return ret;
709 } 709 }
710 710
@@ -712,11 +712,11 @@ int rndis_filter_device_add(struct hv_device *dev,
712 /* Initialize the rndis device */ 712 /* Initialize the rndis device */
713 net_device = hv_get_drvdata(dev); 713 net_device = hv_get_drvdata(dev);
714 714
715 net_device->extension = rndisDevice; 715 net_device->extension = rndis_device;
716 rndisDevice->net_dev = net_device; 716 rndis_device->net_dev = net_device;
717 717
718 /* Send the rndis initialization message */ 718 /* Send the rndis initialization message */
719 ret = rndis_filter_init_device(rndisDevice); 719 ret = rndis_filter_init_device(rndis_device);
720 if (ret != 0) { 720 if (ret != 0) {
721 /* 721 /*
722 * TODO: If rndis init failed, we will need to shut down the 722 * TODO: If rndis init failed, we will need to shut down the
@@ -725,21 +725,21 @@ int rndis_filter_device_add(struct hv_device *dev,
725 } 725 }
726 726
727 /* Get the mac address */ 727 /* Get the mac address */
728 ret = rndis_filter_query_device_mac(rndisDevice); 728 ret = rndis_filter_query_device_mac(rndis_device);
729 if (ret != 0) { 729 if (ret != 0) {
730 /* 730 /*
731 * TODO: shutdown rndis device and the channel 731 * TODO: shutdown rndis device and the channel
732 */ 732 */
733 } 733 }
734 734
735 memcpy(deviceInfo->mac_adr, rndisDevice->hw_mac_adr, ETH_ALEN); 735 memcpy(deviceInfo->mac_adr, rndis_device->hw_mac_adr, ETH_ALEN);
736 736
737 rndis_filter_query_device_link_status(rndisDevice); 737 rndis_filter_query_device_link_status(rndis_device);
738 738
739 deviceInfo->link_state = rndisDevice->link_stat; 739 deviceInfo->link_state = rndis_device->link_stat;
740 740
741 dev_info(&dev->device, "Device MAC %pM link state %s", 741 dev_info(&dev->device, "Device MAC %pM link state %s",
742 rndisDevice->hw_mac_adr, 742 rndis_device->hw_mac_adr,
743 ((deviceInfo->link_state) ? ("down\n") : ("up\n"))); 743 ((deviceInfo->link_state) ? ("down\n") : ("up\n")));
744 744
745 return ret; 745 return ret;