The following commit has been merged in the merge/master branch: commit aeb92dd0c6dcae0bdb5d3359a888064d7783c3cc Merge: cb02b8d163d2875999c0dc96cf1a3830131fe000 712a23ebf8db7c58bb7788563f1bba937c49df15 Author: Antonio Quartulli antonio@meshcoding.com Date: Sat Oct 12 17:03:24 2013 +0200

Merge remote-tracking branch 'pkg/next' into merge/master

Conflicts: Documentation/accounting/README Documentation/accounting/compat.h Documentation/accounting/main.h Documentation/accounting/packet.h Documentation/accounting/sysfs-class-net-mesh

diff --combined Documentation/ABI/testing/sysfs-class-net-mesh index fcb60e1,7982a31..7982a31 --- a/Documentation/ABI/testing/sysfs-class-net-mesh +++ b/Documentation/ABI/testing/sysfs-class-net-mesh @@@ -1,7 -1,7 +1,7 @@@

What: /sys/class/net/<mesh_iface>/mesh/aggregated_ogms Date: May 2010 - Contact: Marek Lindner mareklindner@neomailbox.ch + Contact: Marek Lindner lindner_marek@yahoo.de Description: Indicates whether the batman protocol messages of the mesh <mesh_iface> shall be aggregated or not. @@@ -42,21 -42,21 +42,21 @@@ Description

What: /sys/class/net/<mesh_iface>/mesh/gw_bandwidth Date: October 2010 - Contact: Marek Lindner <mareklindner@neomailbox.ch + Contact: Marek Lindner lindner_marek@yahoo.de Description: Defines the bandwidth which is propagated by this node if gw_mode was set to 'server'.

What: /sys/class/net/<mesh_iface>/mesh/gw_mode Date: October 2010 - Contact: Marek Lindner mareklindner@neomailbox.ch + Contact: Marek Lindner lindner_marek@yahoo.de Description: Defines the state of the gateway features. Can be either 'off', 'client' or 'server'.

What: /sys/class/net/<mesh_iface>/mesh/gw_sel_class Date: October 2010 - Contact: Marek Lindner mareklindner@neomailbox.ch + Contact: Marek Lindner lindner_marek@yahoo.de Description: Defines the selection criteria this node will use to choose a gateway if gw_mode was set to 'client'. @@@ -78,14 -78,14 +78,14 @@@ Description

What: /sys/class/net/<mesh_iface>/mesh/orig_interval Date: May 2010 - Contact: Marek Lindner mareklindner@neomailbox.ch + Contact: Marek Lindner lindner_marek@yahoo.de Description: Defines the interval in milliseconds in which batman sends its protocol messages.

What: /sys/class/net/<mesh_iface>/mesh/routing_algo Date: Dec 2011 - Contact: Marek Lindner mareklindner@neomailbox.ch + Contact: Marek Lindner lindner_marek@yahoo.de Description: Defines the routing procotol this mesh instance uses to find the optimal paths through the mesh. diff --combined Documentation/networking/batman-adv.txt index 89490beb,89ace66..89ace66 --- a/Documentation/networking/batman-adv.txt +++ b/Documentation/networking/batman-adv.txt @@@ -199,5 -199,5 +199,5 @@@ Mailing-list: b.a.t.m.a.n@open-mesh.o

You can also contact the Authors:

- Marek Lindner mareklindner@neomailbox.ch + Marek Lindner lindner_marek@yahoo.de Simon Wunderlich sw@simonwunderlich.de diff --combined net/batman-adv/main.h index 773301a,ff39e46..ff39e46 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@@ -20,7 -20,7 +20,7 @@@ #ifndef _NET_BATMAN_ADV_MAIN_H_ #define _NET_BATMAN_ADV_MAIN_H_

- #define BATADV_DRIVER_AUTHOR "Marek Lindner mareklindner@neomailbox.ch, " \ + #define BATADV_DRIVER_AUTHOR "Marek Lindner lindner_marek@yahoo.de, " \ "Simon Wunderlich sw@simonwunderlich.de" #define BATADV_DRIVER_DESC "B.A.T.M.A.N. advanced" #define BATADV_DRIVER_DEVICE "batman-adv" @@@ -174,6 -174,7 +174,7 @@@ enum batadv_uev_type #include <linux/jiffies.h> #include <linux/seq_file.h> #include <linux/if_vlan.h> + #include "compat.h"

#include "types.h"

diff --combined net/batman-adv/packet.h index f4bbb05,9fbcaac..9fbcaac --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h @@@ -195,7 -195,7 +195,7 @@@ struct batadv_ogm_packet #define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet)

/** - * batadc_icmp_header - common ICMP header + * batadv_icmp_header - common ICMP header * @header: common batman header * @msg_type: ICMP packet type * @dst: address of the destination node