pull request: batman-adv 2011-05-08
Message ID | 1304868284-9364-1-git-send-email-sven@narfation.org (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers |
Return-Path: <sven@narfation.org> Received: from v3-1039.vlinux.de (narfation.org [79.140.41.39]) by open-mesh.org (Postfix) with ESMTPS id C0BB61541D4 for <b.a.t.m.a.n@lists.open-mesh.org>; Sun, 8 May 2011 17:24:49 +0200 (CEST) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@narfation.org; dkim-adsp=pass Received: from sven-desktop.home.narfation.org (unknown [88.130.172.152]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id F3158940E6; Sun, 8 May 2011 17:25:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=narfation.org; s=mail; t=1304868304; bh=Ruk8U3DxlDQEzcowIqS4qWMvJ8KxToGg9kFUttOHO0Q=; h=From:To:Cc:Subject:Date:Message-Id; b=HPz2lxcVrw98OexQiaT4vSiirWQBMZV3WlVqyRlGUbjQOn1qMkBkzfgh3PlCqztyu hpaWQlneW7qk7LmXJgve+Eqagyjx+kwpTtHJCi4zjxA1heKW9uiNu41Xn62Noy+7cw mvwUWZAZFf2/B2UrdQ/hYnXZuUzIMHEeQjrzxghw= From: Sven Eckelmann <sven@narfation.org> To: davem@davemloft.net Date: Sun, 8 May 2011 17:24:36 +0200 Message-Id: <1304868284-9364-1-git-send-email-sven@narfation.org> X-Mailer: git-send-email 1.7.5.1 Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org Subject: [B.A.T.M.A.N.] pull request: batman-adv 2011-05-08 X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking <b.a.t.m.a.n@lists.open-mesh.org> List-Id: The list for a Better Approach To Mobile Ad-hoc Networking <b.a.t.m.a.n.lists.open-mesh.org> List-Unsubscribe: <https://lists.open-mesh.org/mm/options/b.a.t.m.a.n>, <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=unsubscribe> List-Archive: <http://lists.open-mesh.org/pipermail/b.a.t.m.a.n> List-Post: <mailto:b.a.t.m.a.n@lists.open-mesh.org> List-Help: <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=help> List-Subscribe: <https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n>, <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=subscribe> X-List-Received-Date: Sun, 08 May 2011 15:24:49 -0000 |
Pull-request
git://git.open-mesh.org/ecsv/linux-merge.git batman-adv/nextMessage
Sven Eckelmann
May 8, 2011, 3:24 p.m. UTC
Hi, I would like to propose following patches for net-next-2.6/2.6.40. They include minor cleanups of comments, a big rename patch s/hna/tt/, but also a remove some duplicated code. The spinlock which protected the list of possible interfaces for batman-adv was completely replaced by rtnl_lock because we want to be in sync with the rest of the network stack and the extra spinlock made everything more complex without giving any additional feature (and rtnl_lock was already used everywhere). Related to this patch is also a fix which should prevent a deadlock between the sysfs code and the event listener. Also the reference counting in find_router was fixed when an error was detected after the refcounter was already increased. The only feature is the support for multiple vlans in the bridge loop detection code. I will submit a patch to remove the atomic_dec_not_zero from main.h after Linus accepted the patch you already saw. thanks, Sven The following changes since commit 32ae9b221e788413ce68feaae2ca39e406211a0a: batman-adv: Make bat_priv->primary_if an rcu protected pointer (2011-05-01 22:49:03 +0200) are available in the git repository at: git://git.open-mesh.org/ecsv/linux-merge.git batman-adv/next Antonio Quartulli (1): batman-adv: rename everything from *hna* into *tt* (translation table) Daniele Furlan (1): batman-adv: remove duplicate code from function is_bidirectional_neigh() Marek Lindner (3): batman-adv: remove misplaced comment batman-adv: multi vlan support for bridge loop detection batman-adv: Fix refcount imbalance in find_router Sven Eckelmann (3): batman-adv: Remove unnecessary hardif_list_lock batman-adv: Avoid deadlock between rtnl_lock and s_active batman-adv: Remove multiline comments from line ending Documentation/networking/batman-adv.txt | 11 +- net/batman-adv/aggregation.c | 16 +- net/batman-adv/aggregation.h | 4 +- net/batman-adv/bat_debugfs.c | 4 +- net/batman-adv/bat_sysfs.c | 16 +- net/batman-adv/hard-interface.c | 36 +-- net/batman-adv/main.c | 20 +- net/batman-adv/main.h | 42 ++-- net/batman-adv/originator.c | 10 +- net/batman-adv/packet.h | 5 +- net/batman-adv/routing.c | 162 ++++++------- net/batman-adv/routing.h | 6 +- net/batman-adv/send.c | 16 +- net/batman-adv/send.h | 2 +- net/batman-adv/soft-interface.c | 409 +++++++++++++++++++++--------- net/batman-adv/translation-table.c | 417 ++++++++++++++++--------------- net/batman-adv/translation-table.h | 24 +- net/batman-adv/types.h | 49 +++-- net/batman-adv/unicast.c | 2 +- net/batman-adv/vis.c | 18 +- 20 files changed, 712 insertions(+), 557 deletions(-)
Comments
From: Sven Eckelmann <sven@narfation.org> Date: Sun, 8 May 2011 17:24:36 +0200 > Hi, > > I would like to propose following patches for net-next-2.6/2.6.40. They > include minor cleanups of comments, a big rename patch s/hna/tt/, but > also a remove some duplicated code. The spinlock which protected the > list of possible interfaces for batman-adv was completely replaced by > rtnl_lock because we want to be in sync with the rest of the network > stack and the extra spinlock made everything more complex without giving > any additional feature (and rtnl_lock was already used everywhere). > Related to this patch is also a fix which should prevent a deadlock > between the sysfs code and the event listener. Also the reference > counting in find_router was fixed when an error was detected after the > refcounter was already increased. The only feature is the support for > multiple vlans in the bridge loop detection code. > > I will submit a patch to remove the atomic_dec_not_zero from main.h > after Linus accepted the patch you already saw. Pulled, thanks Sven.