diff options
| author | David S. Miller <davem@davemloft.net> | 2012-03-09 17:34:20 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-09 17:34:20 -0500 |
| commit | b2d3298e0916fa059712691c85a0e97becc4ab9f (patch) | |
| tree | c7d5ea46a9dbf9cebdb122df4aaf0beda6e7621e /drivers/net/hyperv | |
| parent | 1a0bdadb4e36abac63b0a9787f372aac30c11a9e (diff) | |
| parent | a7f4255f906f60f72e00aad2fb000939449ff32e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/hyperv')
| -rw-r--r-- | drivers/net/hyperv/netvsc_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 0ae7a1a6aeb0..217dfedbba20 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c | |||
| @@ -310,7 +310,7 @@ int netvsc_recv_callback(struct hv_device *device_obj, | |||
| 310 | static void netvsc_get_drvinfo(struct net_device *net, | 310 | static void netvsc_get_drvinfo(struct net_device *net, |
| 311 | struct ethtool_drvinfo *info) | 311 | struct ethtool_drvinfo *info) |
| 312 | { | 312 | { |
| 313 | strcpy(info->driver, "hv_netvsc"); | 313 | strcpy(info->driver, KBUILD_MODNAME); |
| 314 | strcpy(info->version, HV_DRV_VERSION); | 314 | strcpy(info->version, HV_DRV_VERSION); |
| 315 | strcpy(info->fw_version, "N/A"); | 315 | strcpy(info->fw_version, "N/A"); |
| 316 | } | 316 | } |
| @@ -482,7 +482,7 @@ MODULE_DEVICE_TABLE(vmbus, id_table); | |||
| 482 | 482 | ||
| 483 | /* The one and only one */ | 483 | /* The one and only one */ |
| 484 | static struct hv_driver netvsc_drv = { | 484 | static struct hv_driver netvsc_drv = { |
| 485 | .name = "netvsc", | 485 | .name = KBUILD_MODNAME, |
| 486 | .id_table = id_table, | 486 | .id_table = id_table, |
| 487 | .probe = netvsc_probe, | 487 | .probe = netvsc_probe, |
| 488 | .remove = netvsc_remove, | 488 | .remove = netvsc_remove, |