netpoll setup error handling

The beast was not always healthy. When it was sick,
it tended to be laconic and not tell anyone the real problem.
A few small changes had it telling the world about its
problems, if they really wanted to hear.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index bf58db29e2ed6342bd707931ccd598a3c376b07c..e6e8a9797b6dbff81c8f4a8be6e34e58bef82811 100644 (file)
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -102,6 +102,8 @@ __setup("netconsole=", option_setup);
 
 static int init_netconsole(void)
 {
+       int err;
+
        if(strlen(config))
                option_setup(config);
 
@@ -110,8 +112,9 @@ static int init_netconsole(void)
                return 0;
        }
 
-       if(netpoll_setup(&np))
-               return -EINVAL;
+       err = netpoll_setup(&np);
+       if (err)
+               return err;
 
        register_console(&netconsole);
        printk(KERN_INFO "netconsole: network logging started\n");

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index ac4e8b8f57d1d603840997e1d92ca419ce67bde5..621baa5da49f433d5b9925facd5fcbab80189ac9 100644 (file)
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -611,20 +611,23 @@ int netpoll_setup(struct netpoll *np)
        struct in_device *in_dev;
        struct netpoll_info *npinfo;
        unsigned long flags;
+       int err;
 
        if (np->dev_name)
                ndev = dev_get_by_name(np->dev_name);
        if (!ndev) {
                printk(KERN_ERR "%s: %s doesn't exist, aborting.\n",
                       np->name, np->dev_name);
-               return -1;
+               return -ENODEV;
        }
 
        np->dev = ndev;
        if (!ndev->npinfo) {
                npinfo = kmalloc(sizeof(*npinfo), GFP_KERNEL);
-               if (!npinfo)
+               if (!npinfo) {
+                       err = -ENOMEM;
                        goto release;
+               }
 
                npinfo->rx_flags = 0;
                npinfo->rx_np = NULL;
@@ -645,6 +648,7 @@ int netpoll_setup(struct netpoll *np)
        if (!ndev->poll_controller) {
                printk(KERN_ERR "%s: %s doesn't support polling, aborting.\n",
                       np->name, np->dev_name);
+               err = -ENOTSUPP;
                goto release;
        }
 
@@ -655,13 +659,14 @@ int netpoll_setup(struct netpoll *np)
                       np->name, np->dev_name);
 
                rtnl_lock();
-               if (dev_change_flags(ndev, ndev->flags | IFF_UP) < 0) {
+               err = dev_open(ndev);
+               rtnl_unlock();
+
+               if (err) {
                        printk(KERN_ERR "%s: failed to open %s\n",
-                              np->name, np->dev_name);
-                       rtnl_unlock();
+                              np->name, ndev->name);
                        goto release;
                }
-               rtnl_unlock();
 
                atleast = jiffies + HZ/10;
                atmost = jiffies + 4*HZ;
@@ -699,6 +704,7 @@ int netpoll_setup(struct netpoll *np)
                        rcu_read_unlock();
                        printk(KERN_ERR "%s: no IP address for %s, aborting\n",
                               np->name, np->dev_name);
+                       err = -EDESTADDRREQ;
                        goto release;
                }
 
@@ -731,7 +737,7 @@ int netpoll_setup(struct netpoll *np)
                kfree(npinfo);
        np->dev = NULL;
        dev_put(ndev);
-       return -1;
+       return err;
 }
 
 static int __init netpoll_init(void) {