Author: marek Date: 2009-12-05 15:43:00 +0000 (Sat, 05 Dec 2009) New Revision: 1491

Modified: trunk/batman-adv-kernelland/Makefile.kbuild trunk/batman-adv-kernelland/README trunk/batman-adv-kernelland/main.c trunk/batman-adv-kernelland/main.h Log: [batman-adv] correctly name the configuration option for debugging

Signed-off-by: Andrew Lunn andrew@lunn.ch Signed-off-by: Marek Lindner lindner_marek@yahoo.de

Modified: trunk/batman-adv-kernelland/Makefile.kbuild =================================================================== --- trunk/batman-adv-kernelland/Makefile.kbuild 2009-12-03 03:29:56 UTC (rev 1490) +++ trunk/batman-adv-kernelland/Makefile.kbuild 2009-12-05 15:43:00 UTC (rev 1491) @@ -25,7 +25,7 @@ -include $(TOPDIR)/Rules.make endif

-# EXTRA_CFLAGS += -DCONFIG_BATMAN_DEBUG +# EXTRA_CFLAGS += -DCONFIG_BATMAN_ADV_DEBUG

ifneq ($(REVISION),) EXTRA_CFLAGS += -DREVISION_VERSION="r$(REVISION)"

Modified: trunk/batman-adv-kernelland/README =================================================================== --- trunk/batman-adv-kernelland/README 2009-12-03 03:29:56 UTC (rev 1490) +++ trunk/batman-adv-kernelland/README 2009-12-05 15:43:00 UTC (rev 1491) @@ -115,7 +115,7 @@ "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

Modified: trunk/batman-adv-kernelland/main.c =================================================================== --- trunk/batman-adv-kernelland/main.c 2009-12-03 03:29:56 UTC (rev 1490) +++ trunk/batman-adv-kernelland/main.c 2009-12-05 15:43:00 UTC (rev 1491) @@ -57,7 +57,7 @@

struct workqueue_struct *bat_event_workqueue;

-#ifdef CONFIG_BATMAN_DEBUG +#ifdef CONFIG_BATMAN_ADV_DEBUG int debug;

module_param(debug, int, 0644);

Modified: trunk/batman-adv-kernelland/main.h =================================================================== --- trunk/batman-adv-kernelland/main.h 2009-12-03 03:29:56 UTC (rev 1490) +++ trunk/batman-adv-kernelland/main.h 2009-12-05 15:43:00 UTC (rev 1491) @@ -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 @@ 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)