Commit 734cc82a authored by Andrew Lunn's avatar Andrew Lunn Committed by Greg Kroah-Hartman
Browse files

Staging: batman-adv: Fix the naming of the debug option. 



So that the configuration hierarchy is correct, set the debug option
to have the same base as the main BATMAN option.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarMarek Lindner <lindner_marek@yahoo.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8a2e042c

drivers/staging/batman-adv/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -14,10 +14,10 @@ config BATMAN_ADV 
        http://www.open-mesh.org/ for more information and user space

        tools.



config BATMAN_DEBUG

config BATMAN_ADV_DEBUG

	bool "B.A.T.M.A.N. debugging"

	depends on BATMAN_ADV != n

	help

	---help---



	  This is an option for use by developers; most people should

	  say N here. This enables compilation of support for

drivers/staging/batman-adv/README

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ kernel, use "make menuconfig" and enable the option 
"B.A.T.M.A.N. debugging". When compiling outside of the kernel tree it

is necessary to edit the file Makefile.kbuild and uncomment the line



#EXTRA_CFLAGS += -DCONFIG_BATMAN_DEBUG

#EXTRA_CFLAGS += -DCONFIG_BATMAN_ADV_DEBUG



The additional debug output is by default disabled. It can be enabled

either at kernel modules load time or during run time. To enable debug

drivers/staging/batman-adv/main.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ atomic_t module_state; 


struct workqueue_struct *bat_event_workqueue;



#ifdef CONFIG_BATMAN_DEBUG

#ifdef CONFIG_BATMAN_ADV_DEBUG

int debug;



module_param(debug, int, 0644);

drivers/staging/batman-adv/main.h

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 
			 * broadcasting / etc */

#define DBG_ROUTES 2	/* route or hna added / changed / deleted */



#ifdef CONFIG_BATMAN_DEBUG

#ifdef CONFIG_BATMAN_ADV_DEBUG

extern int debug;



extern int bat_debug_type(int type);
@@ -85,7 +85,7 @@ extern int bat_debug_type(int type); 
			printk(KERN_DEBUG "batman-adv:" fmt, ## arg);	\

	}								\

	while (0)

#else /* !CONFIG_BATMAN_DEBUG */

#else /* !CONFIG_BATMAN_ADV_DEBUG */

#define bat_dbg(type, fmt, arg...) do {		\

	}					\

	while (0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE