Skip to content

Commit

Permalink
Staging: batman-adv: Fix the naming of the debug option.
Browse files Browse the repository at this point in the history
So that the configuration hierarchy is correct, set the debug option
to have the same base as the main BATMAN option.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Andrew Lunn authored and Greg Kroah-Hartman committed Mar 4, 2010
1 parent 8a2e042 commit 734cc82
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/batman-adv/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/batman-adv/README
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/batman-adv/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/batman-adv/main.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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)
Expand Down

0 comments on commit 734cc82

Please sign in to comment.