Hi,

it seems a bunch of patches are missing in net-next from batman-adv next's branch.

An incorrect lockdep_assert was fixed to refer to the correct lock. The flag FIRST_HOP was dropped because it is not used anymore in the batman-adv compat version 15. The bridge loop avoidance code will now cleanup its internal state when it gets disabled. This is required to reset itself in case it gets restarted again. Also the behavior when the user tries to enable the already started bridge loop avoidance was modified to just ignore this trigger. It was also tuned to better cope with networks using very lossy links.

The rest are only contain minor cleanups of the code, updates of the documentation and kerneldoc inside the batman-adv source code.

Kind regards, Sven

Antonio Quartulli (3): batman-adv: fix kerneldoc for DAT functions batman-adv: fix kerneldoc for TT functions batman-adv: add kernel doc for AP isolation attributes in bat_priv

Marek Lindner (2): batman-adv: remove leftovers of unused BATADV_PRIMARIES_FIRST_HOP flag batman-adv: kernel doc readability updates

Markus Elfring (4): batman-adv: Delete unnecessary checks before the function call "kfree_skb" batman-adv: Less checks in batadv_tvlv_unicast_send() batman-adv: Delete an unnecessary check before the function call "batadv_softif_vlan_free_ref" batman-adv: Split a condition check

Simon Wunderlich (5): batman-adv: Start new development cycle batman-adv: purge bridge loop avoidance when its disabled batman-adv: increase BLA wait periods to 6 batman-adv: only call post function if something changed batman-adv: Update/repair bridge loop avoidance kerneldoc

Sven Eckelmann (14): batman-adv: Fix lockdep annotation of batadv_tlv_container_remove batman-adv: Add function to convert string to batadv throughput batman-adv: Change ifconfig examples to iproute2 batman-adv: Fix kernel-doc parsing of main structs batman-adv: Fix kerneldoc member names in for main structs batman-adv: Remove kerneldoc for missing struct members batman-adv: Add kerneldoc for batadv_neigh_node::refcount batman-adv: Fix kerneldoc parsing of structs/enums batman-adv: Remove kerneldoc for missing parameters batman-adv: Fix names in kerneldoc of functions batman-adv: Drop invalid kerneldoc for variable batadv_vlan_attrs batman-adv: Fix kerneldoc parsing of return description batman-adv: Fix kerneldoc of main functions batman-adv: Fix kerneldoc of network-coding functions

Documentation/networking/batman-adv.txt | 9 +- net/batman-adv/bat_iv_ogm.c | 21 ++- net/batman-adv/bitarray.c | 12 +- net/batman-adv/bitarray.h | 12 +- net/batman-adv/bridge_loop_avoidance.c | 247 ++++++++++++++++++++++++-------- net/batman-adv/bridge_loop_avoidance.h | 2 + net/batman-adv/debugfs.c | 6 + net/batman-adv/distributed-arp-table.c | 41 +++--- net/batman-adv/fragmentation.c | 18 +-- net/batman-adv/fragmentation.h | 2 +- net/batman-adv/gateway_client.c | 14 +- net/batman-adv/gateway_common.c | 119 +++++++-------- net/batman-adv/hard-interface.c | 7 +- net/batman-adv/hash.h | 22 +-- net/batman-adv/main.c | 45 +++--- net/batman-adv/main.h | 21 ++- net/batman-adv/multicast.c | 35 +++-- net/batman-adv/multicast.h | 2 +- net/batman-adv/network-coding.c | 59 ++++---- net/batman-adv/originator.c | 54 ++++--- net/batman-adv/packet.h | 20 +-- net/batman-adv/routing.c | 36 +++-- net/batman-adv/send.c | 32 +++-- net/batman-adv/send.h | 4 +- net/batman-adv/soft-interface.c | 18 +-- net/batman-adv/sysfs.c | 31 ++-- net/batman-adv/translation-table.c | 125 +++++++++------- net/batman-adv/types.h | 60 ++++---- 28 files changed, 650 insertions(+), 424 deletions(-)