The following commit has been merged in the master branch: commit 1aee9b47eab62668ded02ed09f6f12c0d67e3c8a Author: Marek Lindner lindner_marek@yahoo.de Date: Wed Apr 18 17:16:39 2012 +0800

batman-adv: ignore trailing CR when comparing protocol names

Signed-off-by: Marek Lindner lindner_marek@yahoo.de

diff --git a/main.c b/main.c index 170f65f..25c2e2b 100644 --- a/main.c +++ b/main.c @@ -380,14 +380,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 = {