summaryrefslogtreecommitdiff
path: root/drivers/net/dummy.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2007-07-11 19:42:13 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-07-11 19:45:33 -0700
commit2d85cba2b272a5201a60966a65a4f8c0bcc0bb71 (patch)
treef8dd1ca6d7c963eade714a4ecc7aec4d7751f55a /drivers/net/dummy.c
parent8c979c26a0f093c13290320edda799d8335e50ae (diff)
downloadlinux-3.10-2d85cba2b272a5201a60966a65a4f8c0bcc0bb71.tar.gz
linux-3.10-2d85cba2b272a5201a60966a65a4f8c0bcc0bb71.tar.bz2
linux-3.10-2d85cba2b272a5201a60966a65a4f8c0bcc0bb71.zip
[RTNETLINK]: rtnl_link API simplification
All drivers need to unregister their devices in the module unload function. While doing so they must hold the rtnl and atomically unregister the rtnl_link ops as well. This makes the rtnl_link_unregister function that takes the rtnl itself completely useless. Provide default newlink/dellink functions, make __rtnl_link_unregister and rtnl_link_unregister unregister all devices with matching rtnl_link_ops and change the existing users to take advantage of that. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dummy.c')
-rw-r--r--drivers/net/dummy.c57
1 files changed, 3 insertions, 54 deletions
diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
index 91126b9ce45..373ff700404 100644
--- a/drivers/net/dummy.c
+++ b/drivers/net/dummy.c
@@ -37,11 +37,6 @@
#include <linux/rtnetlink.h>
#include <net/rtnetlink.h>
-struct dummy_priv {
- struct net_device *dev;
- struct list_head list;
-};
-
static int numdummies = 1;
static int dummy_xmit(struct sk_buff *skb, struct net_device *dev);
@@ -89,37 +84,9 @@ static int dummy_xmit(struct sk_buff *skb, struct net_device *dev)
return 0;
}
-static LIST_HEAD(dummies);
-
-static int dummy_newlink(struct net_device *dev,
- struct nlattr *tb[], struct nlattr *data[])
-{
- struct dummy_priv *priv = netdev_priv(dev);
- int err;
-
- err = register_netdevice(dev);
- if (err < 0)
- return err;
-
- priv->dev = dev;
- list_add_tail(&priv->list, &dummies);
- return 0;
-}
-
-static void dummy_dellink(struct net_device *dev)
-{
- struct dummy_priv *priv = netdev_priv(dev);
-
- list_del(&priv->list);
- unregister_netdevice(dev);
-}
-
static struct rtnl_link_ops dummy_link_ops __read_mostly = {
.kind = "dummy",
- .priv_size = sizeof(struct dummy_priv),
.setup = dummy_setup,
- .newlink = dummy_newlink,
- .dellink = dummy_dellink,
};
/* Number of dummy devices to be set up by this module. */
@@ -129,12 +96,9 @@ MODULE_PARM_DESC(numdummies, "Number of dummy pseudo devices");
static int __init dummy_init_one(void)
{
struct net_device *dev_dummy;
- struct dummy_priv *priv;
int err;
- dev_dummy = alloc_netdev(sizeof(struct dummy_priv), "dummy%d",
- dummy_setup);
-
+ dev_dummy = alloc_netdev(0, "dummy%d", dummy_setup);
if (!dev_dummy)
return -ENOMEM;
@@ -146,10 +110,6 @@ static int __init dummy_init_one(void)
err = register_netdevice(dev_dummy);
if (err < 0)
goto err;
-
- priv = netdev_priv(dev_dummy);
- priv->dev = dev_dummy;
- list_add_tail(&priv->list, &dummies);
return 0;
err:
@@ -159,7 +119,6 @@ err:
static int __init dummy_init_module(void)
{
- struct dummy_priv *priv, *next;
int i, err = 0;
rtnl_lock();
@@ -167,11 +126,8 @@ static int __init dummy_init_module(void)
for (i = 0; i < numdummies && !err; i++)
err = dummy_init_one();
- if (err < 0) {
- list_for_each_entry_safe(priv, next, &dummies, list)
- dummy_dellink(priv->dev);
+ if (err < 0)
__rtnl_link_unregister(&dummy_link_ops);
- }
rtnl_unlock();
return err;
@@ -179,14 +135,7 @@ static int __init dummy_init_module(void)
static void __exit dummy_cleanup_module(void)
{
- struct dummy_priv *priv, *next;
-
- rtnl_lock();
- list_for_each_entry_safe(priv, next, &dummies, list)
- dummy_dellink(priv->dev);
-
- __rtnl_link_unregister(&dummy_link_ops);
- rtnl_unlock();
+ rtnl_link_unregister(&dummy_link_ops);
}
module_init(dummy_init_module);