From 43d1086daaad54985d0a29b8a6b2e26a681c1fd3 Mon Sep 17 00:00:00 2001 From: Marek Lindner Date: Wed, 18 Apr 2012 17:16:39 +0800 Subject: [PATCH] --- yaml --- r: 314301 b: refs/heads/master c: d8cb548616524e10d36b4241b03893a11655ec5d h: refs/heads/master i: 314299: 96310ac47d9282b04e0128f17b3beec2ef009f9e v: v3 --- [refs] | 2 +- trunk/net/batman-adv/main.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2ea745eae53c..a5b5af6221bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 519d3497c667ed2f26f0b7ea56f1451e387264d7 +refs/heads/master: d8cb548616524e10d36b4241b03893a11655ec5d diff --git a/trunk/net/batman-adv/main.c b/trunk/net/batman-adv/main.c index 65b4f0824e4f..8610b5caa178 100644 --- a/trunk/net/batman-adv/main.c +++ b/trunk/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 = {