diff options
| author | Marek Lindner <[email protected]> | 2013-10-12 14:10:03 +0000 |
|---|---|---|
| committer | Antonio Quartulli <[email protected]> | 2013-10-19 12:53:48 +0000 |
| commit | bc58eeef744df93e141678ef44452f0869cd563d (patch) | |
| tree | eb55a3c43a1e4e891924877ceecba767f220230f | |
| parent | batman-adv: update email address for Antonio Quartulli (diff) | |
| download | kernel-bc58eeef744df93e141678ef44452f0869cd563d.tar.gz kernel-bc58eeef744df93e141678ef44452f0869cd563d.zip | |
batman-adv: update email address for Marek Lindner
Signed-off-by: Marek Lindner <[email protected]>
Signed-off-by: Antonio Quartulli <[email protected]>
| -rw-r--r-- | Documentation/ABI/testing/sysfs-class-net-batman-adv | 4 | ||||
| -rw-r--r-- | Documentation/ABI/testing/sysfs-class-net-mesh | 12 | ||||
| -rw-r--r-- | Documentation/networking/batman-adv.txt | 2 | ||||
| -rw-r--r-- | net/batman-adv/main.h | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/Documentation/ABI/testing/sysfs-class-net-batman-adv b/Documentation/ABI/testing/sysfs-class-net-batman-adv index bdc00707c751..7f34a95bb963 100644 --- a/Documentation/ABI/testing/sysfs-class-net-batman-adv +++ b/Documentation/ABI/testing/sysfs-class-net-batman-adv @@ -1,13 +1,13 @@ What: /sys/class/net/<iface>/batman-adv/iface_status Date: May 2010 -Contact: Marek Lindner <[email protected]> +Contact: Marek Lindner <[email protected]> Description: Indicates the status of <iface> as it is seen by batman. What: /sys/class/net/<iface>/batman-adv/mesh_iface Date: May 2010 -Contact: Marek Lindner <[email protected]> +Contact: Marek Lindner <[email protected]> Description: The /sys/class/net/<iface>/batman-adv/mesh_iface file displays the batman mesh interface this <iface> diff --git a/Documentation/ABI/testing/sysfs-class-net-mesh b/Documentation/ABI/testing/sysfs-class-net-mesh index a86528c38237..dfdea2bc2286 100644 --- a/Documentation/ABI/testing/sysfs-class-net-mesh +++ b/Documentation/ABI/testing/sysfs-class-net-mesh @@ -1,7 +1,7 @@ What: /sys/class/net/<mesh_iface>/mesh/aggregated_ogms Date: May 2010 -Contact: Marek Lindner <[email protected]> +Contact: Marek Lindner <[email protected]> Description: Indicates whether the batman protocol messages of the mesh <mesh_iface> shall be aggregated or not. @@ -41,21 +41,21 @@ Description: What: /sys/class/net/<mesh_iface>/mesh/gw_bandwidth Date: October 2010 -Contact: Marek Lindner <[email protected]> +Contact: Marek Lindner <[email protected]> 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 <[email protected]> +Contact: Marek Lindner <[email protected]> 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 <[email protected]> +Contact: Marek Lindner <[email protected]> Description: Defines the selection criteria this node will use to choose a gateway if gw_mode was set to 'client'. @@ -77,14 +77,14 @@ Description: What: /sys/class/net/<mesh_iface>/mesh/orig_interval Date: May 2010 -Contact: Marek Lindner <[email protected]> +Contact: Marek Lindner <[email protected]> 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 <[email protected]> +Contact: Marek Lindner <[email protected]> Description: Defines the routing procotol this mesh instance uses to find the optimal paths through the mesh. diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt index 89ace66bfe9a..89490beb3c0b 100644 --- a/Documentation/networking/batman-adv.txt +++ b/Documentation/networking/batman-adv.txt @@ -199,5 +199,5 @@ Mailing-list: [email protected] (optional subscription You can also contact the Authors: -Marek Lindner <[email protected]> +Marek Lindner <[email protected]> Simon Wunderlich <[email protected]> diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index c754f8e5bc3c..ff55dccbf6e4 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -20,7 +20,7 @@ #ifndef _NET_BATMAN_ADV_MAIN_H_ #define _NET_BATMAN_ADV_MAIN_H_ -#define BATADV_DRIVER_AUTHOR "Marek Lindner <[email protected]>, " \ +#define BATADV_DRIVER_AUTHOR "Marek Lindner <[email protected]>, " \ "Simon Wunderlich <[email protected]>" #define BATADV_DRIVER_DESC "B.A.T.M.A.N. advanced" #define BATADV_DRIVER_DEVICE "batman-adv" |