[1/4] batman-adv: Update README to match mainline README.

Message ID 1272719410-406-2-git-send-email-andrew@lunn.ch (mailing list archive)
State Rejected, archived
Headers

Commit Message

Andrew Lunn May 1, 2010, 1:10 p.m. UTC
  Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 README |   35 +++++++++--------------------------
 1 files changed, 9 insertions(+), 26 deletions(-)
  

Comments

Sven Eckelmann May 1, 2010, 1:53 p.m. UTC | #1
Andrew Lunn wrote:
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> ---
>  README |   35 +++++++++--------------------------
>  1 files changed, 9 insertions(+), 26 deletions(-)
> 
> diff --git a/README b/README
> index 4c2a6c6..e2a7271 100644
> --- a/README
> +++ b/README
> @@ -15,19 +15,6 @@ above B.A.T.M.A.N. Advanced, prominent examples are:
> IPv4, IPv6, DHCP, IPX. This is batman-advanced implemented as Linux kernel
> driver. It does not depend on any network (other) driver, and can be used
> on wifi as well as ethernet, vpn, etc ... (anything with ethernet-style
> layer 2).
> -It compiles against and should work with Linux 2.6.20 - 2.6.33. 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

This should not be removed from maint or trunk.

>  USAGE
>  -----
> @@ -123,15 +110,11 @@ dmesg | grep batman-adv
> 
>  When investigating problems with your mesh network it is sometimes
>  necessary to see more detail debug messages. This must be enabled when
> -compiling the batman-adv module. When building batman-adv as part of
> -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_ADV_DEBUG
> +compiling the batman-adv module. Use "make menuconfig" and enable the
> +option "B.A.T.M.A.N. debugging".

This should not be changed in maint or trunk.

>  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
> +either at kernel module load time or during run time. To enable debug
>  output at module load time, add the module parameter debug=<value>.
>  <value> can take one of four values.
> 
> @@ -160,12 +143,12 @@ to see the debug messages.
>  BATCTL
>  ------
> 
> -B.A.T.M.A.N.  advanced  operates on layer 2 and thus all hosts partici-
> -pating in the virtual switch are completely transparent for all  proto-
> -cols above layer 2. Therefore the common diagnosis tools do not work as
> -expected. To overcome these problems batctl was created. At the  moment
> -the  batctl contains ping, traceroute, tcpdump and interfaces to the
> -kernel module settings.
> +B.A.T.M.A.N.  advanced operates on layer 2 and thus all hosts
> +participating in the virtual switch are completely transparent for all
> +protocols above layer 2. Therefore the common diagnosis tools do not
> +work as expected. To overcome these problems batctl was created. At
> +the moment the batctl contains ping, traceroute, tcpdump and
> +interfaces to the kernel module settings.
> 
>  For more information, please see the manpage (man batctl).

This looks fine :)

Best regards,
	Sven
  
Andrew Lunn May 1, 2010, 2:26 p.m. UTC | #2
On Sat, May 01, 2010 at 03:53:12PM +0200, Sven Eckelmann wrote:
> Andrew Lunn wrote:
> > Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> > ---
> >  README |   35 +++++++++--------------------------
> >  1 files changed, 9 insertions(+), 26 deletions(-)

Humm. The README actually needs a lot of work. It still talks about
using proc for files which are now in /sys. It is probably better to
wait for Marek to update README then look at synchronizing what can be
synchronized.

     Andrew
  

Patch

diff --git a/README b/README
index 4c2a6c6..e2a7271 100644
--- a/README
+++ b/README
@@ -15,19 +15,6 @@  above B.A.T.M.A.N. Advanced, prominent examples are: IPv4, IPv6, DHCP, IPX.
 This is batman-advanced implemented as Linux kernel driver. It does not depend
 on any network (other) driver, and can be used on wifi as well as ethernet,
 vpn, etc ... (anything with ethernet-style layer 2).
-It compiles against and should work with Linux 2.6.20 - 2.6.33. 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
 
 USAGE
 -----
@@ -123,15 +110,11 @@  dmesg | grep batman-adv
 
 When investigating problems with your mesh network it is sometimes
 necessary to see more detail debug messages. This must be enabled when
-compiling the batman-adv module. When building batman-adv as part of
-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_ADV_DEBUG
+compiling the batman-adv module. Use "make menuconfig" and enable the
+option "B.A.T.M.A.N. debugging".
 
 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
+either at kernel module load time or during run time. To enable debug
 output at module load time, add the module parameter debug=<value>.
 <value> can take one of four values.
 
@@ -160,12 +143,12 @@  to see the debug messages.
 BATCTL
 ------
 
-B.A.T.M.A.N.  advanced  operates on layer 2 and thus all hosts partici-
-pating in the virtual switch are completely transparent for all  proto-
-cols above layer 2. Therefore the common diagnosis tools do not work as
-expected. To overcome these problems batctl was created. At the  moment
-the  batctl contains ping, traceroute, tcpdump and interfaces to the
-kernel module settings.
+B.A.T.M.A.N.  advanced operates on layer 2 and thus all hosts
+participating in the virtual switch are completely transparent for all
+protocols above layer 2. Therefore the common diagnosis tools do not
+work as expected. To overcome these problems batctl was created. At
+the moment the batctl contains ping, traceroute, tcpdump and
+interfaces to the kernel module settings.
 
 For more information, please see the manpage (man batctl).