Commit 86c921af authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman

Staging: hv: netvsc: Rename netDevice as net_device

Rename netDevice as net_device.
Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d982042b
...@@ -382,7 +382,10 @@ int netvsc_device_remove(struct hv_device *device) ...@@ -382,7 +382,10 @@ int netvsc_device_remove(struct hv_device *device)
hv_set_drvdata(device, NULL); hv_set_drvdata(device, NULL);
spin_unlock_irqrestore(&device->channel->inbound_lock, flags); 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"); dev_notice(&device->device, "net device safe to remove\n");
/* Now, we can close the channel safely */ /* Now, we can close the channel safely */
......
...@@ -689,7 +689,7 @@ int rndis_filter_device_add(struct hv_device *dev, ...@@ -689,7 +689,7 @@ int rndis_filter_device_add(struct hv_device *dev,
void *additional_info) void *additional_info)
{ {
int ret; int ret;
struct netvsc_device *netDevice; struct netvsc_device *net_device;
struct rndis_device *rndisDevice; struct rndis_device *rndisDevice;
struct netvsc_device_info *deviceInfo = additional_info; struct netvsc_device_info *deviceInfo = additional_info;
...@@ -710,10 +710,10 @@ int rndis_filter_device_add(struct hv_device *dev, ...@@ -710,10 +710,10 @@ int rndis_filter_device_add(struct hv_device *dev,
/* Initialize the rndis device */ /* Initialize the rndis device */
netDevice = hv_get_drvdata(dev); net_device = hv_get_drvdata(dev);
netDevice->extension = rndisDevice; net_device->extension = rndisDevice;
rndisDevice->net_dev = netDevice; rndisDevice->net_dev = net_device;
/* Send the rndis initialization message */ /* Send the rndis initialization message */
ret = rndis_filter_init_device(rndisDevice); ret = rndis_filter_init_device(rndisDevice);
...@@ -762,12 +762,12 @@ void rndis_filter_device_remove(struct hv_device *dev) ...@@ -762,12 +762,12 @@ void rndis_filter_device_remove(struct hv_device *dev)
int rndis_filter_open(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 -EINVAL;
return rndis_filter_open_device(netDevice->extension); return rndis_filter_open_device(net_device->extension);
} }
int rndis_filter_close(struct hv_device *dev) int rndis_filter_close(struct hv_device *dev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment