From patchwork Tue Jul 5 13:44:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 103294 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D20BEB6F69 for ; Tue, 5 Jul 2011 23:44:35 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751876Ab1GENoa (ORCPT ); Tue, 5 Jul 2011 09:44:30 -0400 Received: from nm7.bullet.mail.ukl.yahoo.com ([217.146.182.248]:39954 "HELO nm7.bullet.mail.ukl.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751372Ab1GENo3 (ORCPT ); Tue, 5 Jul 2011 09:44:29 -0400 Received: from [217.146.183.217] by nm7.bullet.mail.ukl.yahoo.com with NNFMP; 05 Jul 2011 13:44:28 -0000 Received: from [77.238.184.76] by tm10.bullet.mail.ukl.yahoo.com with NNFMP; 05 Jul 2011 13:44:28 -0000 Received: from [127.0.0.1] by smtp145.mail.ukl.yahoo.com with NNFMP; 05 Jul 2011 13:44:28 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1309873468; bh=Q9Isma+Cl3CCT1rLamw/yHHgpxvcyR+2afVpB/GmG6c=; h=X-Yahoo-Newman-Id:Received:X-Yahoo-SMTP:X-YMail-OSG:X-Yahoo-Newman-Property:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=RDZLKKb0o4VRi0/Un1IKF8jM4LniBg8A9se59ZXphNC3SkvR3zASN6WCoIfR3hYNM2j0bCgoi24eQVlTvcmMtiQmJ8OkXOAekX8I9WU25nDPTaESYGWaqKjW5n7wq8wvfNeBL5H3ejslKLRnR6tB4NWLsh4H7nR1JlDz9yPd1Ng= X-Yahoo-Newman-Id: 374188.15184.bm@smtp145.mail.ukl.yahoo.com Received: from localhost (lindner_marek@90.35.97.9 with plain) by smtp145.mail.ukl.yahoo.com with SMTP; 05 Jul 2011 13:44:27 +0000 GMT X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- X-YMail-OSG: FhxvUXUVM1lJ_ehHGmr_S2bVmiUZtrKxg25T8iDOk__BsEl KYeIKs7Jfg4nr1p67G8B6JGCqTjvqxxwnwRkXwGuuy4gWVC9JCihmmiGIJ9A dIQ2qeAUB4lBLJ7fVvV5KQqJrj61IAE5jZX1kaVYszXWbUxauBDHaitiJJ8l .aCn.mBbq6luBc58GjuFc2xofkQ.GZpBOyEujm7TRH5nt5BC_.G7hbcIjhKp dxirCqS1.6YlewYL7zqTt98fisc1_ichG6oRJLL43OrUUQwIrIgYkYkbL4Yb oT4w7J0uLyCVTeapz2l2f5TslsNURn5Q9HV7zjK0MuMGP4Sda2RJvoA-- X-Yahoo-Newman-Property: ymail-3 From: Marek Lindner To: davem@davemloft.net Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org, Sven Eckelmann , Marek Lindner Subject: [PATCH 6/6] batman-adv: Replace version info instead of appending them Date: Tue, 5 Jul 2011 15:44:00 +0200 Message-Id: <1309873440-11704-7-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.5.3 In-Reply-To: <1309873440-11704-1-git-send-email-lindner_marek@yahoo.de> References: <1309873440-11704-1-git-send-email-lindner_marek@yahoo.de> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Sven Eckelmann The version number of modules build outside of the tree can get revision numbers added. This is useful to give hints about the revision of a distribution package and the used patchset. The prepended source number or branch name doesn't add any additional information which would help to identify problems and can therefore be omitted. Signed-off-by: Sven Eckelmann Signed-off-by: Marek Lindner --- net/batman-adv/gateway_client.c | 5 ++--- net/batman-adv/main.c | 9 ++------- net/batman-adv/main.h | 11 +++-------- net/batman-adv/originator.c | 5 ++--- 4 files changed, 9 insertions(+), 21 deletions(-) diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index 8b25b52..056180e 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -487,10 +487,9 @@ int gw_client_seq_print_text(struct seq_file *seq, void *offset) } seq_printf(seq, " %-12s (%s/%i) %17s [%10s]: gw_class ... " - "[B.A.T.M.A.N. adv %s%s, MainIF/MAC: %s/%pM (%s)]\n", + "[B.A.T.M.A.N. adv %s, MainIF/MAC: %s/%pM (%s)]\n", "Gateway", "#", TQ_MAX_VALUE, "Nexthop", - "outgoingIF", SOURCE_VERSION, REVISION_VERSION_STR, - primary_if->net_dev->name, + "outgoingIF", SOURCE_VERSION, primary_if->net_dev->name, primary_if->net_dev->dev_addr, net_dev->name); rcu_read_lock(); diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index e367e69..b0f9068 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -58,9 +58,8 @@ static int __init batman_init(void) register_netdevice_notifier(&hard_if_notifier); - pr_info("B.A.T.M.A.N. advanced %s%s (compatibility version %i) " - "loaded\n", SOURCE_VERSION, REVISION_VERSION_STR, - COMPAT_VERSION); + pr_info("B.A.T.M.A.N. advanced %s (compatibility version %i) " + "loaded\n", SOURCE_VERSION, COMPAT_VERSION); return 0; } @@ -184,8 +183,4 @@ MODULE_LICENSE("GPL"); MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC); MODULE_SUPPORTED_DEVICE(DRIVER_DEVICE); -#ifdef REVISION_VERSION -MODULE_VERSION(SOURCE_VERSION "-" REVISION_VERSION); -#else MODULE_VERSION(SOURCE_VERSION); -#endif diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 4f293b5..a6df61a 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -27,8 +27,9 @@ #define DRIVER_DESC "B.A.T.M.A.N. advanced" #define DRIVER_DEVICE "batman-adv" -#define SOURCE_VERSION "next" - +#ifndef SOURCE_VERSION +#define SOURCE_VERSION "2011.3.0" +#endif /* B.A.T.M.A.N. parameters */ @@ -144,12 +145,6 @@ enum dbg_level { #include #include "types.h" -#ifndef REVISION_VERSION -#define REVISION_VERSION_STR "" -#else -#define REVISION_VERSION_STR " "REVISION_VERSION -#endif - extern struct list_head hardif_list; extern unsigned char broadcast_addr[]; diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 338b3c5..4cc94d4 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -430,9 +430,8 @@ int orig_seq_print_text(struct seq_file *seq, void *offset) goto out; } - seq_printf(seq, "[B.A.T.M.A.N. adv %s%s, MainIF/MAC: %s/%pM (%s)]\n", - SOURCE_VERSION, REVISION_VERSION_STR, - primary_if->net_dev->name, + seq_printf(seq, "[B.A.T.M.A.N. adv %s, MainIF/MAC: %s/%pM (%s)]\n", + SOURCE_VERSION, primary_if->net_dev->name, primary_if->net_dev->dev_addr, net_dev->name); seq_printf(seq, " %-15s %s (%s/%i) %17s [%10s]: %20s ...\n", "Originator", "last-seen", "#", TQ_MAX_VALUE, "Nexthop",