Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d39badf0 authored by Satyam Sharma's avatar Satyam Sharma Committed by David S. Miller
Browse files

[NET] netconsole: Cleanups, codingstyle, prettyfication 



Based upon initial work by Keiichi Kii <k-keiichi@bx.jp.nec.com>.

(1) Remove unwanted headers.
(2) Mark __init and __exit as appropriate.
(3) Various trivial codingstyle and prettification stuff.

Signed-off-by: default avatarSatyam Sharma <satyam@infradead.org>
Signed-off-by: default avatarKeiichi Kii <k-keiichi@bx.jp.nec.com>
Acked-by: default avatarMatt Mackall <mpm@selenic.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ab66b4a7

drivers/net/netconsole.c

+27 −28
Original line number Diff line number Diff line
@@ -35,23 +35,22 @@ 
 ****************************************************************/



#include <linux/mm.h>

#include <linux/tty.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/console.h>

#include <linux/tty_driver.h>

#include <linux/moduleparam.h>

#include <linux/string.h>

#include <linux/sysrq.h>

#include <linux/smp.h>

#include <linux/netpoll.h>



MODULE_AUTHOR("Maintainer: Matt Mackall <mpm@selenic.com>");

MODULE_DESCRIPTION("Console driver for network interfaces");

MODULE_LICENSE("GPL");



static char config[256];

module_param_string(netconsole, config, 256, 0);

#define MAX_PARAM_LENGTH	256

#define MAX_PRINT_CHUNK		1000



static char config[MAX_PARAM_LENGTH];

module_param_string(netconsole, config, MAX_PARAM_LENGTH, 0);

MODULE_PARM_DESC(netconsole, " netconsole=[src-port]@[src-ip]/[dev],[tgt-port]@<tgt-ip>/[tgt-macaddr]\n");



static struct netpoll np = {
@@ -61,9 +60,7 @@ static struct netpoll np = { 
	.remote_port	= 6666,

	.remote_mac	= {0xff, 0xff, 0xff, 0xff, 0xff, 0xff},

};

static int configured = 0;



#define MAX_PRINT_CHUNK 1000

static int configured;



static void write_msg(struct console *con, const char *msg, unsigned int len)

{
@@ -88,10 +85,10 @@ static void write_msg(struct console *con, const char *msg, unsigned int len) 
static struct console netconsole = {

	.name	= "netcon",

	.flags	= CON_ENABLED | CON_PRINTBUFFER,

	.write = write_msg

	.write	= write_msg,

};



static int option_setup(char *opt)

static int __init option_setup(char *opt)

{

	configured = !netpoll_parse_options(&np, opt);

	return 1;
@@ -99,28 +96,30 @@ static int option_setup(char *opt) 


__setup("netconsole=", option_setup);



static int init_netconsole(void)

static int __init init_netconsole(void)

{

	int err;

	int err = 0;



	if(strlen(config))

	if (strnlen(config, MAX_PARAM_LENGTH))

		option_setup(config);



	if (!configured) {

		printk("netconsole: not configured, aborting\n");

		return 0;

		printk(KERN_INFO "netconsole: not configured, aborting\n");

		goto out;

	}



	err = netpoll_setup(&np);

	if (err)

		return err;

		goto out;



	register_console(&netconsole);

	printk(KERN_INFO "netconsole: network logging started\n");

	return 0;



out:

	return err;

}



static void cleanup_netconsole(void)

static void __exit cleanup_netconsole(void)

{

	unregister_console(&netconsole);

	netpoll_cleanup(&np);