The following commit has been merged in the master branch: commit b42bb08d07964db71fc30217403bd3a49ce1ba76 Merge: c103efd9af4ca23f75d77ff10fb7af5a95ece3c3 dcac0a5750eb3c69eec84e0741df481451909480 Author: Sven Eckelmann sven@narfation.org Date: Mon Nov 14 10:03:00 2011 +0100

Merge commit 'v2011.4.0'

Conflicts: README

diff --combined README index 5ba56b5,c50cc0a..b4fdc8d --- a/README +++ b/README @@@ -1,4 -1,4 +1,4 @@@ - [state: 30-09-2011] + [state: 13-11-2011]

BATMAN-ADV ---------- @@@ -18,7 -18,7 +18,7 @@@ Batman advanced was implemented as a Li duce the overhead to a minimum. It does not depend on any (other) network driver, and can be used on wifi as well as ethernet lan, vpn, etc ... (anything with ethernet-style layer 2). It compiles - against and should work with Linux 2.6.29 - 3.1. Supporting + against and should work with Linux 2.6.29 - 3.2. Supporting older versions is not planned, but it's probably easy to backport it. If you work on a backport, feel free to contact us. :-)

@@@ -206,7 -206,7 +206,7 @@@ option "B.A.T.M.A.N. debugging". When c kernel tree it is necessary to edit the file Makefile.kbuild and uncomment the line

-#EXTRA_CFLAGS += -DCONFIG_BATMAN_ADV_DEBUG +#ccflags-y += -DCONFIG_BATMAN_ADV_DEBUG

Those additional debug messages can be accessed using a special file in debugfs @@@ -218,15 -218,16 +218,16 @@@ abled during run time. Following log_l

0 - All debug output disabled 1 - Enable messages related to routing / flooding / broadcasting - 2 - Enable route or tt entry added / changed / deleted - 3 - Enable all messages + 2 - Enable messages related to route added / changed / deleted + 4 - Enable messages related to translation table operations + 7 - Enable all messages

The debug output can be changed at runtime using the file /sys/class/net/bat0/mesh/log_level. e.g.

# echo 2 > /sys/class/net/bat0/mesh/log_level

- will enable debug messages for when routes or TTs change. + will enable debug messages for when routes change.

BATCTL