pull request [net]: batman-adv 20160430
Message ID | 1462035963-28970-1-git-send-email-a@unstable.cc (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers |
Return-Path: <b.a.t.m.a.n-bounces@lists.open-mesh.org> X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from open-mesh.org (localhost [IPv6:::1]) by open-mesh.org (Postfix) with ESMTP id 806048032E; Sat, 30 Apr 2016 19:06:39 +0200 (CEST) Authentication-Results: open-mesh.org; dmarc=none header.from=unstable.cc Received-SPF: Permerror (SPF Permanent Error: Two or more type TXT spf records found.) identity=mailfrom; client-ip=5.148.176.60; helo=s2.neomailbox.net; envelope-from=a@unstable.cc; receiver=b.a.t.m.a.n@lists.open-mesh.org Authentication-Results: open-mesh.org; dmarc=none header.from=unstable.cc Received: from s2.neomailbox.net (s2.neomailbox.net [5.148.176.60]) by open-mesh.org (Postfix) with ESMTPS id A25C28032E for <b.a.t.m.a.n@lists.open-mesh.org>; Sat, 30 Apr 2016 19:06:36 +0200 (CEST) From: Antonio Quartulli <a@unstable.cc> To: davem@davemloft.net Date: Sun, 1 May 2016 01:05:59 +0800 Message-Id: <1462035963-28970-1-git-send-email-a@unstable.cc> Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org Subject: [B.A.T.M.A.N.] pull request [net]: batman-adv 20160430 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 <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> Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking <b.a.t.m.a.n@lists.open-mesh.org> Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" <b.a.t.m.a.n-bounces@lists.open-mesh.org> |
Pull-request
git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davemMessage
Antonio Quartulli
April 30, 2016, 5:05 p.m. UTC
Hello David, this is another pull request intended for net. I know that I sent another batch a few days ago, but after having gone through my queue I thought that merging these last 4 patches would still be worth it (there won't be any other pull request for linux-4.6 :)). The description of the changes follows below. Please pull or let me know of any issue! Thanks a lot, Antonio The following changes since commit 1dfcd832b1a9ed45edac15b31d079b805fa0ae2a: Merge branch 'bpf-fixes' (2016-04-28 17:29:46 -0400) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem for you to fetch changes up to abe59c65225ccd63a5964e2f2a73dd2995b948e7: batman-adv: Fix reference counting of hardif_neigh_node object for neigh_node (2016-04-29 19:46:11 +0800) ---------------------------------------------------------------- In this small batch of patches you have: - a fix for our Distributed ARP Table that makes sure that the input provided to the hash function during a query is the same as the one provided during an insert (so to prevent false negatives), by Antonio Quartulli - a fix for our new protocol implementation B.A.T.M.A.N. V that ensures that a hard interface is properly re-activated when it is brought down and then up again, by Antonio Quartulli - two fixes respectively to the reference counting of the tt_local_entry and neigh_node objects, by Sven Eckelmann. Such bug is rather severe as it would prevent the netdev objects references by batman-adv from being released after shutdown. ---------------------------------------------------------------- Antonio Quartulli (2): batman-adv: fix DAT candidate selection (must use vid) batman-adv: B.A.T.M.A.N V - make sure iface is reactivated upon NETDEV_UP event Sven Eckelmann (2): batman-adv: Fix reference counting of vlan object for tt_local_entry batman-adv: Fix reference counting of hardif_neigh_node object for neigh_node net/batman-adv/bat_v.c | 12 ++++++++++ net/batman-adv/distributed-arp-table.c | 17 ++++++++------ net/batman-adv/hard-interface.c | 3 +++ net/batman-adv/originator.c | 16 ++++--------- net/batman-adv/translation-table.c | 42 ++++------------------------------ net/batman-adv/types.h | 7 ++++++ 6 files changed, 41 insertions(+), 56 deletions(-)
Comments
From: Antonio Quartulli <a@unstable.cc> Date: Sun, 1 May 2016 01:05:59 +0800 > this is another pull request intended for net. > > I know that I sent another batch a few days ago, but after having gone > through my queue I thought that merging these last 4 patches would still > be worth it (there won't be any other pull request for linux-4.6 :)). > > The description of the changes follows below. Pulled, thanks Antonio.
On Tue, May 03, 2016 at 12:18:13AM -0400, David Miller wrote:
> Pulled, thanks Antonio.
Thanks a lot David.
We now have some patches for net-next that somewhat depend on the fixes you
have recently pulled.
Do you have any plan on merging net into net-next in the following days ?
I am asking because I'd prefer to avoid you the hassle of dealing with the
conflicts.
Cheers,
From: Antonio Quartulli <a@unstable.cc> Date: Tue, 3 May 2016 22:42:29 +0800 > Do you have any plan on merging net into net-next in the following days ? > > I am asking because I'd prefer to avoid you the hassle of dealing with the > conflicts. I'll try to do this in the next few days.
From: David Miller <davem@davemloft.net> Date: Tue, 03 May 2016 12:33:30 -0400 (EDT) > From: Antonio Quartulli <a@unstable.cc> > Date: Tue, 3 May 2016 22:42:29 +0800 > >> Do you have any plan on merging net into net-next in the following days ? >> >> I am asking because I'd prefer to avoid you the hassle of dealing with the >> conflicts. > > I'll try to do this in the next few days. Just FYI I did this last night.
On Wed, May 04, 2016 at 02:13:50PM -0400, David Miller wrote: > > Just FYI I did this last night. Thanks a lot for letting me know David. Cheers,