Skip to content

Commit

Permalink
Staging: hv: netvsc: Rename netDevice as net_device
Browse files Browse the repository at this point in the history
Rename netDevice as net_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>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Sep 16, 2011
1 parent d982042 commit 86c921a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
5 changes: 4 additions & 1 deletion drivers/staging/hv/netvsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
14 changes: 7 additions & 7 deletions drivers/staging/hv/rndis_filter.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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);
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 86c921a

Please sign in to comment.