Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Andrew Lunn and committed by
Greg Kroah-Hartman
734cc82a 8a2e042c

+6 -6
+2 -2
drivers/staging/batman-adv/Kconfig
··· 14 14 http://www.open-mesh.org/ for more information and user space 15 15 tools. 16 16 17 - config BATMAN_DEBUG 17 + config BATMAN_ADV_DEBUG 18 18 bool "B.A.T.M.A.N. debugging" 19 19 depends on BATMAN_ADV != n 20 - help 20 + ---help--- 21 21 22 22 This is an option for use by developers; most people should 23 23 say N here. This enables compilation of support for
+1 -1
drivers/staging/batman-adv/README
··· 115 115 "B.A.T.M.A.N. debugging". When compiling outside of the kernel tree it 116 116 is necessary to edit the file Makefile.kbuild and uncomment the line 117 117 118 - #EXTRA_CFLAGS += -DCONFIG_BATMAN_DEBUG 118 + #EXTRA_CFLAGS += -DCONFIG_BATMAN_ADV_DEBUG 119 119 120 120 The additional debug output is by default disabled. It can be enabled 121 121 either at kernel modules load time or during run time. To enable debug
+1 -1
drivers/staging/batman-adv/main.c
··· 57 57 58 58 struct workqueue_struct *bat_event_workqueue; 59 59 60 - #ifdef CONFIG_BATMAN_DEBUG 60 + #ifdef CONFIG_BATMAN_ADV_DEBUG 61 61 int debug; 62 62 63 63 module_param(debug, int, 0644);
+2 -2
drivers/staging/batman-adv/main.h
··· 76 76 * broadcasting / etc */ 77 77 #define DBG_ROUTES 2 /* route or hna added / changed / deleted */ 78 78 79 - #ifdef CONFIG_BATMAN_DEBUG 79 + #ifdef CONFIG_BATMAN_ADV_DEBUG 80 80 extern int debug; 81 81 82 82 extern int bat_debug_type(int type); ··· 85 85 printk(KERN_DEBUG "batman-adv:" fmt, ## arg); \ 86 86 } \ 87 87 while (0) 88 - #else /* !CONFIG_BATMAN_DEBUG */ 88 + #else /* !CONFIG_BATMAN_ADV_DEBUG */ 89 89 #define bat_dbg(type, fmt, arg...) do { \ 90 90 } \ 91 91 while (0)