Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44c4349a authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Marek Lindner
Browse files

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: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarMarek Lindner <lindner_marek@yahoo.de>
parent b539e4cd

net/batman-adv/gateway_client.c

+2 −3
Original line number Diff line number Diff line
@@ -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();

net/batman-adv/main.c

+2 −7
Original line number Diff line number Diff line
@@ -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

net/batman-adv/main.h

+3 −8
Original line number Diff line number Diff line
@@ -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[];

net/batman-adv/originator.c

+2 −3
Original line number Diff line number Diff line
@@ -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",