Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 66e74f7402610f5ac9ad769457f01b5254d1b27e..69233f6aa05ca2d115f77ed3c71d00954c5c0204 100644 (file)
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -60,7 +60,6 @@ static struct netpoll np = {
        .local_port = 6665,
        .remote_port = 6666,
        .remote_mac = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-       .drop = netpoll_queue,
 };
 static int configured = 0;
 
@@ -102,16 +101,19 @@ __setup("netconsole=", option_setup);
 
 static int init_netconsole(void)
 {
+       int err;
+
        if(strlen(config))
                option_setup(config);
 
        if(!configured) {
                printk("netconsole: not configured, aborting\n");
-               return -EINVAL;
+               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");