Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 853dc21b authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 6806afc9 12afc36e

Documentation/networking/batman-adv.txt

+4 −5
Original line number Diff line number Diff line
@@ -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:

net/batman-adv/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
config BATMAN_ADV

	tristate "B.A.T.M.A.N. Advanced Meshing Protocol"

	depends on NET

	select CRC16

	select LIBCRC32C

        default n

	help

net/batman-adv/Makefile

+1 −1
Original line number Diff line number Diff line 
#

# Copyright (C) 2007-2013 B.A.T.M.A.N. contributors:

# Copyright (C) 2007-2014 B.A.T.M.A.N. contributors:

#

# Marek Lindner, Simon Wunderlich

#

net/batman-adv/bat_algo.h

+1 −1
Original line number Diff line number Diff line 
/* Copyright (C) 2011-2013 B.A.T.M.A.N. contributors:

/* Copyright (C) 2011-2014 B.A.T.M.A.N. contributors:

 *

 * Marek Lindner

 *

net/batman-adv/bat_iv_ogm.c

+588 −294

File changed.

Preview size limit exceeded, changes collapsed.