diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-14 06:50:27 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-14 06:50:27 +0100 |
| commit | 853dc21bfe15f545347b5c82aad02735d552110d (patch) | |
| tree | e5881a889f67211727d0422d617d01a2c1495da6 /Documentation/networking | |
| parent | net: resort some Kbuild files to hopefully help avoid some conflicts (diff) | |
| parent | batman-adv: drop dependency against CRC16 (diff) | |
| download | linux-853dc21bfe15f545347b5c82aad02735d552110d.tar.xz linux-853dc21bfe15f545347b5c82aad02735d552110d.zip | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Included changes:
- drop dependency against CRC16
- move to new release version
- add size check at compile time for packet structs
- update copyright years in every file
- implement new bonding/interface alternation feature
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/networking')
| -rw-r--r-- | Documentation/networking/batman-adv.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt index 89490beb3c0b..58e49042fc20 100644 --- a/Documentation/networking/batman-adv.txt +++ b/Documentation/networking/batman-adv.txt @@ -66,11 +66,10 @@ All mesh wide settings can be found in batman's own interface folder: # ls /sys/class/net/bat0/mesh/ -# aggregated_ogms gw_bandwidth log_level -# ap_isolation gw_mode orig_interval -# bonding gw_sel_class routing_algo -# bridge_loop_avoidance hop_penalty fragmentation - +#aggregated_ogms distributed_arp_table gw_sel_class orig_interval +#ap_isolation fragmentation hop_penalty routing_algo +#bonding gw_bandwidth isolation_mark vlan0 +#bridge_loop_avoidance gw_mode log_level There is a special folder for debugging information: |