batman-adv: Replace version info instead of appending them

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 <sven@narfation.org>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>

diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index 8b25b52a4764da6f47916755788fd89c3c076923..056180ef9e1a5d8856a784a2ddf396d02d346c71 100644 (file)
--- 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 e367e690a9f6cff091019496fac17f6593fb4c31..b0f9068ade57676b2cab4fbba034a07158378737 100644 (file)
--- 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 4f293b59447548fddaa31d1460f49266092262fa..a6df61a6933b0822c97ca3194de7619d416d4531 100644 (file)
--- 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 <linux/seq_file.h>
 #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 338b3c597e4af68d18758bc9e91e589e2503c178..4cc94d4ba890e1802cc7167065cf2c2f211d908a 100644 (file)
--- 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",