mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Staging: hv: netvsc: Use the newly introduced vmbus ID in netvsc driver 

Use the newly introduced vmbus ID in netvsc driver. Also, do the associated
cleanup.

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>
This commit is contained in:
K. Y. Srinivasan 2011-08-25 09:48:34 -07:00 committed by Greg Kroah-Hartman
parent d847b5fe33
commit 345c4cc3b9
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/hv/netvsc.c
View File

@ -35,15 +35,6 @@
/* Globals */
static const char *driver_name = "netvsc";
/* {F8615163-DF3E-46c5-913F-F2D2F965ED0E} */
static const uuid_le netvsc_device_type = {
.b = {
0x63, 0x51, 0x61, 0xF8, 0x3E, 0xDF, 0xc5, 0x46,
0x91, 0x3F, 0xF2, 0xD2, 0xF9, 0x65, 0xED, 0x0E
}
};
static struct netvsc_device *alloc_net_device(struct hv_device *device)
{
struct netvsc_device *net_device;
@ -1009,7 +1000,6 @@ int netvsc_initialize(struct hv_driver *drv)
{
drv->name = driver_name;
memcpy(&drv->dev_type, &netvsc_device_type, sizeof(uuid_le));
return 0;
}

16
drivers/staging/hv/netvsc_drv.c
View File

@ -413,8 +413,24 @@ static int netvsc_remove(struct hv_device *dev)
return 0;
}
static const struct hv_vmbus_device_id id_table[] = {
{
/* Network guid */
.guid = {
0x63, 0x51, 0x61, 0xF8, 0x3E, 0xDF, 0xc5, 0x46,
0x91, 0x3F, 0xF2, 0xD2, 0xF9, 0x65, 0xED, 0x0E
}
},
{
.guid = { }
},
};
MODULE_DEVICE_TABLE(vmbus, id_table);
/* The one and only one */
static struct hv_driver netvsc_drv = {
.id_table = id_table,
.probe = netvsc_probe,
.remove = netvsc_remove,
};