The following commit has been merged in the linux branch: commit 89b7f227af4a8dbcaf9f17dcfe5ae150b5a00251 Author: Marek Lindner lindner_marek@yahoo.de Date: Mon Jun 21 12:53:28 2010 +0200

Staging: batman-adv: Add sysfs abi documentation about bonding

Signed-off-by: Marek Lindner lindner_marek@yahoo.de

diff --git a/drivers/staging/batman-adv/sysfs-class-net-mesh b/drivers/staging/batman-adv/sysfs-class-net-mesh index c75a87b..5aa1912 100644 --- a/drivers/staging/batman-adv/sysfs-class-net-mesh +++ b/drivers/staging/batman-adv/sysfs-class-net-mesh @@ -6,6 +6,14 @@ Description: Indicates whether the batman protocol messages of the mesh <mesh_iface> shall be aggregated or not.

+What: /sys/class/net/<mesh_iface>/mesh/bonding +Date: June 2010 +Contact: Simon Wunderlich siwu@hrz.tu-chemnitz.de +Description: + Indicates whether the data traffic going through the + mesh will be sent using multiple interfaces at the + same time (if available). + What: /sys/class/net/<mesh_iface>/mesh/orig_interval Date: May 2010 Contact: Marek Lindner lindner_marek@yahoo.de