From patchwork Mon Dec 21 09:39:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 4876 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=79.140.41.39; helo=v3-1039.vlinux.de; envelope-from=sven@narfation.org; receiver=b.a.t.m.a.n@lists.open-mesh.org Authentication-Results: open-mesh.org; dkim=pass reason="1024-bit key; unprotected key" header.d=narfation.org header.i=@narfation.org header.b=kXCxl1qO; dkim-adsp=pass; dkim-atps=neutral Received: from v3-1039.vlinux.de (narfation.org [79.140.41.39]) by open-mesh.org (Postfix) with ESMTPS id C27108055C for ; Mon, 21 Dec 2015 10:39:08 +0100 (CET) Received: from sven-desktop.localnet (unknown [IPv6:2a02:3100:2604:2dfd:325a:3aff:fe53:1ae5]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 75D04110114; Mon, 21 Dec 2015 10:39:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=narfation.org; s=20121; t=1450690748; bh=/SYmtZWFvICoZQjcIBqhHnmrl6LWU8+hAaR6Bczx8nQ=; h=From:To:Cc:Subject:Date:From; b=kXCxl1qObsfALqtw/RG84anK294n29zAaY8RjKu9hKJ3AGnhh2M7/kBkJETUfeo2C josqOxGSQBlsydeFE/eMcBIk5bc9pepBDjN4ANDcSgb1kDscmmQ4UXnS2kpejCIm9f V4sKXbjrDi0C0t/M1hpC2K+P3lNfFGrS+855SGbg= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Mon, 21 Dec 2015 10:39:05 +0100 Message-ID: <2074355.MrCHDIHgv1@sven-desktop> User-Agent: KMail/4.14.10 (Linux/4.2.0-1-amd64; KDE/4.14.14; x86_64; ; ) MIME-Version: 1.0 Subject: [B.A.T.M.A.N.] Missing patches in net-next X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Dec 2015 09:39:09 -0000 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(-) From 8e1271ba42cd2373a8398c9193a72a2df81214b1 Mon Sep 17 00:00:00 2001 From: Antonio Quartulli Date: Tue, 17 Nov 2015 16:40:53 +0800 Subject: [PATCH 28/28] batman-adv: add kernel doc for AP isolation attributes in bat_priv Signed-off-by: Antonio Quartulli --- net/batman-adv/types.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 7f7a0f1..5e8c8df 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -772,6 +772,9 @@ struct batadv_softif_vlan { * @orig_interval: OGM broadcast interval in milliseconds * @hop_penalty: penalty which will be applied to an OGM's tq-field on every hop * @log_level: configured log level (see batadv_dbg_level) + * @isolation_mark: the skb->mark value used to match packets for AP isolation + * @isolation_mark_mask: bitmask identifying the bits in skb->mark to be used + * for the isolation mark * @bcast_seqno: last sent broadcast packet sequence number * @bcast_queue_left: number of remaining buffered broadcast packet slots * @batman_queue_left: number of remaining OGM packet slots -- 2.6.4