Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5e3c2aa authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge

parents 6b28ff3b 091b9483

Documentation/networking/batman-adv.txt

+8 −8
Original line number Diff line number Diff line 
[state: 21-11-2010]

[state: 27-01-2011]



BATMAN-ADV

----------
@@ -67,15 +67,16 @@ All mesh wide settings can be found in batman's own interface 
folder:



#  ls  /sys/class/net/bat0/mesh/

#  aggregated_ogms  bonding  fragmentation  orig_interval

#  vis_mode

#  aggregated_ogms  gw_bandwidth  hop_penalty

#  bonding          gw_mode       orig_interval

#  fragmentation    gw_sel_class  vis_mode





There is a special folder for debugging informations:



#  ls /sys/kernel/debug/batman_adv/bat0/

#  originators  socket  transtable_global  transtable_local

#  vis_data

#  gateways     socket        transtable_global  vis_data

#  originators  softif_neigh  transtable_local





Some of the files contain all sort of status information  regard-
@@ -230,9 +231,8 @@ CONTACT 
Please send us comments, experiences, questions, anything :)



IRC:            #batman   on   irc.freenode.org

Mailing-list:   b.a.t.m.a.n@b.a.t.m.a.n@lists.open-mesh.org

                (optional   subscription   at

                 https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n)

Mailing-list:   b.a.t.m.a.n@open-mesh.org (optional  subscription

          at https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n)



You can also contact the Authors:

net/batman-adv/Makefile

+1 −1
Original line number Diff line number Diff line 
#

# Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:

# Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:

#

# Marek Lindner, Simon Wunderlich

#

net/batman-adv/aggregation.c

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:

 * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:

 *

 * Marek Lindner, Simon Wunderlich

 *

net/batman-adv/aggregation.h

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors:

 * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:

 *

 * Marek Lindner, Simon Wunderlich

 *

net/batman-adv/bat_debugfs.c

+2 −4
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 B.A.T.M.A.N. contributors:

 * Copyright (C) 2010-2011 B.A.T.M.A.N. contributors:

 *

 * Marek Lindner

 *
@@ -52,7 +52,6 @@ static void emit_log_char(struct debug_log *debug_log, char c) 


static int fdebug_log(struct debug_log *debug_log, char *fmt, ...)

{

	int printed_len;

	va_list args;

	static char debug_log_buf[256];

	char *p;
@@ -62,8 +61,7 @@ static int fdebug_log(struct debug_log *debug_log, char *fmt, ...) 


	spin_lock_bh(&debug_log->lock);

	va_start(args, fmt);

	printed_len = vscnprintf(debug_log_buf, sizeof(debug_log_buf),

				 fmt, args);

	vscnprintf(debug_log_buf, sizeof(debug_log_buf), fmt, args);

	va_end(args);



	for (p = debug_log_buf; *p != 0; p++)