From fc2e3715362e43f1e34fceb0c8c49b32c3c548ac Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Tue, 13 Sep 2011 10:59:54 -0700 Subject: [PATCH] --- yaml --- r: 268381 b: refs/heads/master c: 86c921af41f0d40ff9105a73fb20378440f0299f h: refs/heads/master i: 268379: 81ad68f2d38aa5164b4c38d9209ac0b8a5c3bb07 v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/netvsc.c | 5 ++++- trunk/drivers/staging/hv/rndis_filter.c | 14 +++++++------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index a58efc06b1d8..a3b6587f37ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d982042b9b62f3a966e7de5572fd30d131eb5357 +refs/heads/master: 86c921af41f0d40ff9105a73fb20378440f0299f diff --git a/trunk/drivers/staging/hv/netvsc.c b/trunk/drivers/staging/hv/netvsc.c index 2bcc8b2b9b37..b902579c7fe6 100644 --- a/trunk/drivers/staging/hv/netvsc.c +++ b/trunk/drivers/staging/hv/netvsc.c @@ -382,7 +382,10 @@ int netvsc_device_remove(struct hv_device *device) hv_set_drvdata(device, NULL); spin_unlock_irqrestore(&device->channel->inbound_lock, flags); - /* At this point, no one should be accessing netDevice except in here */ + /* + * At this point, no one should be accessing net_device + * except in here + */ dev_notice(&device->device, "net device safe to remove\n"); /* Now, we can close the channel safely */ diff --git a/trunk/drivers/staging/hv/rndis_filter.c b/trunk/drivers/staging/hv/rndis_filter.c index b354b0b62364..efa7df5b1f80 100644 --- a/trunk/drivers/staging/hv/rndis_filter.c +++ b/trunk/drivers/staging/hv/rndis_filter.c @@ -689,7 +689,7 @@ int rndis_filter_device_add(struct hv_device *dev, void *additional_info) { int ret; - struct netvsc_device *netDevice; + struct netvsc_device *net_device; struct rndis_device *rndisDevice; struct netvsc_device_info *deviceInfo = additional_info; @@ -710,10 +710,10 @@ int rndis_filter_device_add(struct hv_device *dev, /* Initialize the rndis device */ - netDevice = hv_get_drvdata(dev); + net_device = hv_get_drvdata(dev); - netDevice->extension = rndisDevice; - rndisDevice->net_dev = netDevice; + net_device->extension = rndisDevice; + rndisDevice->net_dev = net_device; /* Send the rndis initialization message */ ret = rndis_filter_init_device(rndisDevice); @@ -762,12 +762,12 @@ void rndis_filter_device_remove(struct hv_device *dev) int rndis_filter_open(struct hv_device *dev) { - struct netvsc_device *netDevice = hv_get_drvdata(dev); + struct netvsc_device *net_device = hv_get_drvdata(dev); - if (!netDevice) + if (!net_device) return -EINVAL; - return rndis_filter_open_device(netDevice->extension); + return rndis_filter_open_device(net_device->extension); } int rndis_filter_close(struct hv_device *dev)