diff options
| author | David S. Miller <davem@davemloft.net> | 2015-12-16 16:09:40 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-16 16:09:40 (GMT) |
| commit | 04ad37836cc132a2127d8a7de340ffbc912b2c7d (patch) | |
| tree | b4bfac3debd86f270115b7fac431fddbd688b6bf /Documentation | |
| parent | 897ca373be8461efc880cc3288ffcbc2e1fa03b0 (diff) | |
| parent | 5a1dd8a4773d4c24e925cc6154826d555a85c370 (diff) | |
| download | linux-04ad37836cc132a2127d8a7de340ffbc912b2c7d.tar.xz | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Antonio Quartulli says:
====================
Included changes:
- change my email in MAINTAINERS and Doc files
- create and export list of single hop neighs per interface
- protect CRC in the BLA code by means of its own lock
- minor fixes and code cleanups
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/ABI/testing/sysfs-class-net-mesh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/ABI/testing/sysfs-class-net-mesh b/Documentation/ABI/testing/sysfs-class-net-mesh index c464062..c2b956d 100644 --- a/Documentation/ABI/testing/sysfs-class-net-mesh +++ b/Documentation/ABI/testing/sysfs-class-net-mesh @@ -8,7 +8,7 @@ Description: What: /sys/class/net/<mesh_iface>/mesh/<vlan_subdir>/ap_isolation Date: May 2011 -Contact: Antonio Quartulli <antonio@meshcoding.com> +Contact: Antonio Quartulli <a@unstable.cc> Description: Indicates whether the data traffic going from a wireless client to another wireless client will be @@ -70,7 +70,7 @@ Description: What: /sys/class/net/<mesh_iface>/mesh/isolation_mark Date: Nov 2013 -Contact: Antonio Quartulli <antonio@meshcoding.com> +Contact: Antonio Quartulli <a@unstable.cc> Description: Defines the isolation mark (and its bitmask) which is used to classify clients as "isolated" by the |