summaryrefslogtreecommitdiff
path: root/drivers/net/dummy.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/dummy.c')
-rw-r--r--drivers/net/dummy.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
index f8a4eb365c3d..36a4e85c6668 100644
--- a/drivers/net/dummy.c
+++ b/drivers/net/dummy.c
@@ -47,10 +47,11 @@
static int numdummies = 1;
/* fake multicast ability */
-static void set_multicast_list(struct net_device *dev,
- struct netdev_hw_addr_list *uc,
- struct netdev_hw_addr_list *mc)
+static int set_multicast_list(struct net_device *dev,
+ struct netdev_hw_addr_list *uc,
+ struct netdev_hw_addr_list *mc)
{
+ return 0;
}
static void dummy_get_stats64(struct net_device *dev,
@@ -158,7 +159,7 @@ static int __init dummy_init_one(void)
return -ENOMEM;
dev_dummy->rtnl_link_ops = &dummy_link_ops;
- err = register_netdevice(dev_dummy);
+ err = register_netdev(dev_dummy);
if (err < 0)
goto err;
return 0;
@@ -176,15 +177,11 @@ static int __init dummy_init_module(void)
if (err < 0)
return err;
- rtnl_net_lock(&init_net);
-
for (i = 0; i < numdummies && !err; i++) {
err = dummy_init_one();
cond_resched();
}
- rtnl_net_unlock(&init_net);
-
if (err < 0)
rtnl_link_unregister(&dummy_link_ops);