diff options
| author | Marek Lindner <lindner_marek@yahoo.de> | 2012-04-18 17:16:39 +0800 |
|---|---|---|
| committer | Antonio Quartulli <ordex@autistici.org> | 2012-06-18 18:00:59 +0200 |
| commit | d8cb548616524e10d36b4241b03893a11655ec5d (patch) | |
| tree | ec32e19976339a5783c96c4b680846a71c92c90f | |
| parent | 519d3497c667ed2f26f0b7ea56f1451e387264d7 (diff) | |
| download | kernel_goldelico_gta04-d8cb548616524e10d36b4241b03893a11655ec5d.zip kernel_goldelico_gta04-d8cb548616524e10d36b4241b03893a11655ec5d.tar.gz kernel_goldelico_gta04-d8cb548616524e10d36b4241b03893a11655ec5d.tar.bz2 | |
batman-adv: ignore trailing CR when comparing protocol names
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
| -rw-r--r-- | net/batman-adv/main.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 65b4f08..8610b5c 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -381,14 +381,19 @@ int bat_algo_seq_print_text(struct seq_file *seq, void *offset) static int param_set_ra(const char *val, const struct kernel_param *kp) { struct bat_algo_ops *bat_algo_ops; + char *algo_name = (char *)val; + size_t name_len = strlen(algo_name); - bat_algo_ops = bat_algo_get((char *)val); + if (algo_name[name_len - 1] == '\n') + algo_name[name_len - 1] = '\0'; + + bat_algo_ops = bat_algo_get(algo_name); if (!bat_algo_ops) { - pr_err("Routing algorithm '%s' is not supported\n", val); + pr_err("Routing algorithm '%s' is not supported\n", algo_name); return -EINVAL; } - return param_set_copystring(val, kp); + return param_set_copystring(algo_name, kp); } static const struct kernel_param_ops param_ops_ra = { |