The following commit has been merged in the master branch: commit 20b62f30208f334c6a320a4c24b7496319b06ae3 Merge: e4172b0c922f6b4242e1e64789c47bd30afc55e9 c548b324f8f77b386c95f3300f3d85609d6f541f Author: Sven Eckelmann sven@narfation.org Date: Sun Feb 5 15:23:00 2012 +0100

Merge commit 'v2012.0.0'

Conflicts: README

diff --combined README.external index 4aa4763,0000000..98b6e22 mode 100644,000000..100644 --- a/README.external +++ b/README.external @@@ -1,45 -1,0 +1,45 @@@ +BATMAN-ADV external module +-------------------------- + +The batman-adv module is shipped as part of the Linux kernel +and as external module. The external module allows to get +new features without upgrading to a newer kernel version +and to get batman-adv specific bugfixes for kernels that are +not supported anymore. It compiles against and should work - with Linux 2.6.29 - 3.2. Supporting older versions is not ++with Linux 2.6.29 - 3.3. 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. :-) + +COMPILE +------- + +To compile against your currently installed kernel, just type: + +# make + +if you want to compile against some other kernel, use: + +# make KERNELPATH=/path/to/kernel + +if you wont to install this module: + +# sudo make install + +CONFIGURATION +------------- + +The in-kernel module can be configured through +menuconfig. When compiling outside of the kernel, tree it is +necessary to configure it using the make options. Each +option can be set to to y (enabled), n (disabled) or m (build as +module). Available options and their possible values are +(default marked with an "*") + + * CONFIG_BATMAN_ADV_DEBUG=[y|n*] (B.A.T.M.A.N. debugging) + +e.g., debugging can be enabled by + +# make CONFIG_BATMAN_ADV_DEBUG=y + +Keep in mind that all options must also be added to "make +install" call.