From patchwork Wed Apr 18 09:16:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 1745 Return-Path: Received: from nm18.bullet.mail.ukl.yahoo.com (nm18.bullet.mail.ukl.yahoo.com [217.146.183.192]) by open-mesh.org (Postfix) with SMTP id 9C83C6007D7 for ; Wed, 18 Apr 2012 11:16:53 +0200 (CEST) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@yahoo.de; dkim-adsp=none Received: from [217.146.183.208] by nm18.bullet.mail.ukl.yahoo.com with NNFMP; 18 Apr 2012 09:16:53 -0000 Received: from [217.146.182.243] by tm1.bullet.mail.ukl.yahoo.com with NNFMP; 18 Apr 2012 09:16:53 -0000 Received: from [127.0.0.1] by smtp154.mail.ukl.yahoo.com with NNFMP; 18 Apr 2012 09:16:53 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1334740613; bh=C5IpnndTmaGJbEQD06yjiEUSoQlzDPZbjw8mDsl1DcI=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer; b=Wj0oEJyuUoPkUR1th0VqfCnJdhODKixlxSWL3DG9Aunm0aGGXKAPF4w96r/9Y8354uPsmeBSecoly+1RX38+kP192ANMj1ncp6CixXc/JldnUM8LldsJsmKgBlUcG+n2TlMCOQIxCPvGfCsOzqji5wzumN92Cdw2rdff2cjVl0I= X-Yahoo-Newman-Id: 456890.88300.bm@smtp154.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: p3gAXk0VM1nCBWyBulcE63QI5X0TlTHELvnpQ_CcG5H0GOP nmoj6uUY_LeuM8rOQwmEU5S3NxYMRyjZEq5sOmmILnk.m4rXILVjutrrcZuc Qw7nM.PRGjD_TVe8XJAwHQLBRIlaOXpcDfSELHnsjpniSdesVDJ3towBfWUg zVy98O1qMpO7fX6clyMBuxYb.wocPcYBYDHToBwdtibsPKJ5fxTTASlz0dOE LehCvUbvqe2F21QpGHOtN1OpbiXiT7UN70sVf5sTtKtWly.5jNTKBbKsFYVX ZuObM3KzB86_I2LJ2JparUv.1YD7WPaolZWw.rV4TAHw5QLwjnnrIkiGfLg4 zc_rgMvfeYQitKGvGPLuldttnyQa5ubzuberQLhlduUXA578hO3wX50q0y.K Z2g-- X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@210.177.7.38 with plain) by smtp154.mail.ukl.yahoo.com with SMTP; 18 Apr 2012 02:16:52 -0700 PDT From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Wed, 18 Apr 2012 17:16:39 +0800 Message-Id: <1334740599-7912-1-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.9.1 Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: ignore trailing CR when comparing protocol names X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Apr 2012 09:16:53 -0000 Signed-off-by: Marek Lindner --- main.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/main.c b/main.c index 1d338a3..fa29234 100644 --- a/main.c +++ b/main.c @@ -378,14 +378,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 = {