Merge staging-next tree into Linus's latest version

[firefly-linux-kernel-4.4.55.git] / drivers / staging / hv / netvsc_drv.c

diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c
index 1bda2407b49c9f8097d3f66d82e99862f4d28eda..55b993298ff4f34a021c6a5eb952665f9666d40e 100644 (file)
--- a/drivers/staging/hv/netvsc_drv.c
+++ b/drivers/staging/hv/netvsc_drv.c
@@ -369,8 +369,7 @@ static int netvsc_probe(struct device *device)
        if (!net_drv_obj->Base.OnDeviceAdd)
                return -1;
 
-       net = alloc_netdev(sizeof(struct net_device_context), "seth%d",
-                          ether_setup);
+       net = alloc_etherdev(sizeof(struct net_device_context));
        if (!net)
                return -1;