diff options
author | Satyam Sharma <satyam@infradead.org> | 2007-08-10 18:29:47 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:48:03 -0400 |
commit | d2b60881e28072109601c373abd1085499ccfef0 (patch) | |
tree | 141bc863e95a627b3e9d0e838e3e565ba5883e6c /drivers | |
parent | d133ccbdc30c7f86459519cec1126d6473762b10 (diff) |
[NET] netconsole: Simplify boot/module option setup logic
Based upon initial work by Keiichi Kii <k-keiichi@bx.jp.nec.com>.
Presently, boot/module parameters are set up quite differently for the case of
built-in netconsole (__setup() -> obsolete_checksetup() ->
netpoll_parse_options() -> strlen(config) == 0 in init_netconsole()) vs
modular netconsole (module_param_string() -> string copied to the config
variable -> strlen(config) != 0 init_netconsole() -> netpoll_parse_options()).
This patch makes both of them similar by doing exactly the equivalent of a
module_param_string() in option_setup() also -- just copying the param string
passed from the kernel command line into "config" variable. So,
strlen(config) != 0 in both cases, and netpoll_parse_options() is always
called from init_netconsole(), thus making the setup logic for both cases
similar.
Now, option_setup() is only ever called / used for the built-in case, so we
put it inside a #ifndef MODULE, otherwise gcc will complain about
option_setup() being "defined but not used". Also, the "configured" variable
is redundant with this patch and hence removed.
Signed-off-by: Satyam Sharma <satyam@infradead.org>
Signed-off-by: Keiichi Kii <k-keiichi@bx.jp.nec.com>
Acked-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/netconsole.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 2c2aef1ae8eb..e56aa6c9743f 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c | |||
@@ -53,6 +53,15 @@ static char config[MAX_PARAM_LENGTH]; | |||
53 | module_param_string(netconsole, config, MAX_PARAM_LENGTH, 0); | 53 | module_param_string(netconsole, config, MAX_PARAM_LENGTH, 0); |
54 | MODULE_PARM_DESC(netconsole, " netconsole=[src-port]@[src-ip]/[dev],[tgt-port]@<tgt-ip>/[tgt-macaddr]\n"); | 54 | MODULE_PARM_DESC(netconsole, " netconsole=[src-port]@[src-ip]/[dev],[tgt-port]@<tgt-ip>/[tgt-macaddr]\n"); |
55 | 55 | ||
56 | #ifndef MODULE | ||
57 | static int __init option_setup(char *opt) | ||
58 | { | ||
59 | strlcpy(config, opt, MAX_PARAM_LENGTH); | ||
60 | return 1; | ||
61 | } | ||
62 | __setup("netconsole=", option_setup); | ||
63 | #endif /* MODULE */ | ||
64 | |||
56 | static struct netpoll np = { | 65 | static struct netpoll np = { |
57 | .name = "netconsole", | 66 | .name = "netconsole", |
58 | .dev_name = "eth0", | 67 | .dev_name = "eth0", |
@@ -60,7 +69,6 @@ static struct netpoll np = { | |||
60 | .remote_port = 6666, | 69 | .remote_port = 6666, |
61 | .remote_mac = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, | 70 | .remote_mac = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, |
62 | }; | 71 | }; |
63 | static int configured; | ||
64 | 72 | ||
65 | static void write_msg(struct console *con, const char *msg, unsigned int len) | 73 | static void write_msg(struct console *con, const char *msg, unsigned int len) |
66 | { | 74 | { |
@@ -85,26 +93,19 @@ static struct console netconsole = { | |||
85 | .write = write_msg, | 93 | .write = write_msg, |
86 | }; | 94 | }; |
87 | 95 | ||
88 | static int __init option_setup(char *opt) | ||
89 | { | ||
90 | configured = !netpoll_parse_options(&np, opt); | ||
91 | return 1; | ||
92 | } | ||
93 | |||
94 | __setup("netconsole=", option_setup); | ||
95 | |||
96 | static int __init init_netconsole(void) | 96 | static int __init init_netconsole(void) |
97 | { | 97 | { |
98 | int err = 0; | 98 | int err = 0; |
99 | 99 | ||
100 | if (strnlen(config, MAX_PARAM_LENGTH)) | 100 | if (!strnlen(config, MAX_PARAM_LENGTH)) { |
101 | option_setup(config); | ||
102 | |||
103 | if (!configured) { | ||
104 | printk(KERN_INFO "netconsole: not configured, aborting\n"); | 101 | printk(KERN_INFO "netconsole: not configured, aborting\n"); |
105 | goto out; | 102 | goto out; |
106 | } | 103 | } |
107 | 104 | ||
105 | err = netpoll_parse_options(&np, config); | ||
106 | if (err) | ||
107 | goto out; | ||
108 | |||
108 | err = netpoll_setup(&np); | 109 | err = netpoll_setup(&np); |
109 | if (err) | 110 | if (err) |
110 | goto out; | 111 | goto out; |