Skip to content

Commit

Permalink
batman-adv: ignore trailing CR when comparing protocol names
Browse files Browse the repository at this point in the history
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
  • Loading branch information
Marek Lindner authored and Antonio Quartulli committed Jun 18, 2012
1 parent 519d349 commit d8cb548
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions net/batman-adv/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down

0 comments on commit d8cb548

Please sign in to comment.