[BNX2]: Add ethtool support for remote PHY.

[linux-2.6-omap-h63xx.git] / drivers / net / ifb.c

diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
index 07b4c0d7a75c415244077e207428641269f13c6a..669ee1a1b284853c50b7736119e5b60302cd97d4 100644 (file)
--- a/drivers/net/ifb.c
+++ b/drivers/net/ifb.c
@@ -33,12 +33,15 @@
 #include <linux/etherdevice.h>
 #include <linux/init.h>
 #include <linux/moduleparam.h>
+#include <linux/list.h>
 #include <net/pkt_sched.h>
 
 #define TX_TIMEOUT  (2*HZ)
 
 #define TX_Q_LIMIT    32
 struct ifb_private {
+       struct list_head        list;
+       struct net_device       *dev;
        struct net_device_stats stats;
        struct tasklet_struct   ifb_tasklet;
        int     tasklet_pending;
@@ -136,13 +139,14 @@ resched:
 
 }
 
-static void __init ifb_setup(struct net_device *dev)
+static void ifb_setup(struct net_device *dev)
 {
        /* Initialize the device structure. */
        dev->get_stats = ifb_get_stats;
        dev->hard_start_xmit = ifb_xmit;
        dev->open = &ifb_open;
        dev->stop = &ifb_close;
+       dev->destructor = free_netdev;
 
        /* Fill in device structure with ethernet-generic values. */
        ether_setup(dev);
@@ -197,7 +201,7 @@ static struct net_device_stats *ifb_get_stats(struct net_device *dev)
        return stats;
 }
 
-static struct net_device **ifbs;
+static LIST_HEAD(ifbs);
 
 /* Number of ifb devices to be set up by this module. */
 module_param(numifbs, int, 0);
@@ -226,9 +230,41 @@ static int ifb_open(struct net_device *dev)
        return 0;
 }
 
+static int ifb_newlink(struct net_device *dev,
+                      struct nlattr *tb[], struct nlattr *data[])
+{
+       struct ifb_private *priv = netdev_priv(dev);
+       int err;
+
+       err = register_netdevice(dev);
+       if (err < 0)
+               return err;
+
+       priv->dev = dev;
+       list_add_tail(&priv->list, &ifbs);
+       return 0;
+}
+
+static void ifb_dellink(struct net_device *dev)
+{
+       struct ifb_private *priv = netdev_priv(dev);
+
+       list_del(&priv->list);
+       unregister_netdevice(dev);
+}
+
+static struct rtnl_link_ops ifb_link_ops __read_mostly = {
+       .kind           = "ifb",
+       .priv_size      = sizeof(struct ifb_private),
+       .setup          = ifb_setup,
+       .newlink        = ifb_newlink,
+       .dellink        = ifb_dellink,
+};
+
 static int __init ifb_init_one(int index)
 {
        struct net_device *dev_ifb;
+       struct ifb_private *priv;
        int err;
 
        dev_ifb = alloc_netdev(sizeof(struct ifb_private),
@@ -237,49 +273,59 @@ static int __init ifb_init_one(int index)
        if (!dev_ifb)
                return -ENOMEM;
 
-       if ((err = register_netdev(dev_ifb))) {
-               free_netdev(dev_ifb);
-               dev_ifb = NULL;
-       } else {
-               ifbs[index] = dev_ifb;
-       }
+       err = dev_alloc_name(dev_ifb, dev_ifb->name);
+       if (err < 0)
+               goto err;
 
-       return err;
-}
+       dev_ifb->rtnl_link_ops = &ifb_link_ops;
+       err = register_netdevice(dev_ifb);
+       if (err < 0)
+               goto err;
 
-static void ifb_free_one(int index)
-{
-       unregister_netdev(ifbs[index]);
-       free_netdev(ifbs[index]);
+       priv = netdev_priv(dev_ifb);
+       priv->dev = dev_ifb;
+       list_add_tail(&priv->list, &ifbs);
+       return 0;
+
+err:
+       free_netdev(dev_ifb);
+       return err;
 }
 
 static int __init ifb_init_module(void)
 {
-       int i, err = 0;
-       ifbs = kmalloc(numifbs * sizeof(void *), GFP_KERNEL);
-       if (!ifbs)
-               return -ENOMEM;
+       struct ifb_private *priv, *next;
+       int i, err;
+
+       rtnl_lock();
+       err = __rtnl_link_register(&ifb_link_ops);
+
        for (i = 0; i < numifbs && !err; i++)
                err = ifb_init_one(i);
        if (err) {
-               i--;
-               while (--i >= 0)
-                       ifb_free_one(i);
+               list_for_each_entry_safe(priv, next, &ifbs, list)
+                       ifb_dellink(priv->dev);
+               __rtnl_link_unregister(&ifb_link_ops);
        }
+       rtnl_unlock();
 
        return err;
 }
 
 static void __exit ifb_cleanup_module(void)
 {
-       int i;
+       struct ifb_private *priv, *next;
+
+       rtnl_lock();
+       list_for_each_entry_safe(priv, next, &ifbs, list)
+               ifb_dellink(priv->dev);
 
-       for (i = 0; i < numifbs; i++)
-               ifb_free_one(i);
-       kfree(ifbs);
+       __rtnl_link_unregister(&ifb_link_ops);
+       rtnl_unlock();
 }
 
 module_init(ifb_init_module);
 module_exit(ifb_cleanup_module);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Jamal Hadi Salim");
+MODULE_ALIAS_RTNL_LINK("ifb");