|
@@ -34,6 +34,12 @@
|
|
|
#include <linux/etherdevice.h>
|
|
|
#include <linux/init.h>
|
|
|
#include <linux/moduleparam.h>
|
|
|
+#include <linux/rtnetlink.h>
|
|
|
+
|
|
|
+struct dummy_priv {
|
|
|
+ struct net_device *dev;
|
|
|
+ struct list_head list;
|
|
|
+};
|
|
|
|
|
|
static int numdummies = 1;
|
|
|
|
|
@@ -81,18 +87,20 @@ static int dummy_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static struct net_device **dummies;
|
|
|
+static LIST_HEAD(dummies);
|
|
|
|
|
|
/* Number of dummy devices to be set up by this module. */
|
|
|
module_param(numdummies, int, 0);
|
|
|
MODULE_PARM_DESC(numdummies, "Number of dummy pseudo devices");
|
|
|
|
|
|
-static int __init dummy_init_one(int index)
|
|
|
+static int __init dummy_init_one(void)
|
|
|
{
|
|
|
struct net_device *dev_dummy;
|
|
|
+ struct dummy_priv *priv;
|
|
|
int err;
|
|
|
|
|
|
- dev_dummy = alloc_netdev(0, "dummy%d", dummy_setup);
|
|
|
+ dev_dummy = alloc_netdev(sizeof(struct dummy_priv), "dummy%d",
|
|
|
+ dummy_setup);
|
|
|
|
|
|
if (!dev_dummy)
|
|
|
return -ENOMEM;
|
|
@@ -101,40 +109,43 @@ static int __init dummy_init_one(int index)
|
|
|
free_netdev(dev_dummy);
|
|
|
dev_dummy = NULL;
|
|
|
} else {
|
|
|
- dummies[index] = dev_dummy;
|
|
|
+ priv = netdev_priv(dev_dummy);
|
|
|
+ priv->dev = dev_dummy;
|
|
|
+ list_add_tail(&priv->list, &dummies);
|
|
|
}
|
|
|
|
|
|
return err;
|
|
|
}
|
|
|
|
|
|
-static void dummy_free_one(int index)
|
|
|
+static void dummy_free_one(struct net_device *dev)
|
|
|
{
|
|
|
- unregister_netdev(dummies[index]);
|
|
|
- free_netdev(dummies[index]);
|
|
|
+ struct dummy_priv *priv = netdev_priv(dev);
|
|
|
+
|
|
|
+ list_del(&priv->list);
|
|
|
+ unregister_netdev(dev);
|
|
|
+ free_netdev(dev);
|
|
|
}
|
|
|
|
|
|
static int __init dummy_init_module(void)
|
|
|
{
|
|
|
+ struct dummy_priv *priv, *next;
|
|
|
int i, err = 0;
|
|
|
- dummies = kmalloc(numdummies * sizeof(void *), GFP_KERNEL);
|
|
|
- if (!dummies)
|
|
|
- return -ENOMEM;
|
|
|
+
|
|
|
for (i = 0; i < numdummies && !err; i++)
|
|
|
- err = dummy_init_one(i);
|
|
|
+ err = dummy_init_one();
|
|
|
if (err) {
|
|
|
- i--;
|
|
|
- while (--i >= 0)
|
|
|
- dummy_free_one(i);
|
|
|
+ list_for_each_entry_safe(priv, next, &dummies, list)
|
|
|
+ dummy_free_one(priv->dev);
|
|
|
}
|
|
|
return err;
|
|
|
}
|
|
|
|
|
|
static void __exit dummy_cleanup_module(void)
|
|
|
{
|
|
|
- int i;
|
|
|
- for (i = 0; i < numdummies; i++)
|
|
|
- dummy_free_one(i);
|
|
|
- kfree(dummies);
|
|
|
+ struct dummy_priv *priv, *next;
|
|
|
+
|
|
|
+ list_for_each_entry_safe(priv, next, &dummies, list)
|
|
|
+ dummy_free_one(priv->dev);
|
|
|
}
|
|
|
|
|
|
module_init(dummy_init_module);
|