[0/2] pull request for net-next: batman-adv 2017-01-28
Message ID | 20170128105651.3061-1-sw@simonwunderlich.de (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 EFCB2833AA; Sat, 28 Jan 2017 11:56:55 +0100 (CET) Authentication-Results: open-mesh.org; dmarc=none header.from=simonwunderlich.de Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2001:4d88:2000:24::c0de; helo=mail.mail.packetmixer.de; envelope-from=sw@simonwunderlich.de; receiver=b.a.t.m.a.n@lists.open-mesh.org Authentication-Results: open-mesh.org; dmarc=none header.from=simonwunderlich.de Received: from mail.mail.packetmixer.de (packetmixer.de [IPv6:2001:4d88:2000:24::c0de]) by open-mesh.org (Postfix) with ESMTPS id 1BD108339C for <b.a.t.m.a.n@lists.open-mesh.org>; Sat, 28 Jan 2017 11:56:53 +0100 (CET) Received: from kero.packetmixer.de (p549BC579.dip0.t-ipconnect.de [84.155.197.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mail.packetmixer.de (Postfix) with ESMTPSA id 48AC11902B0; Sat, 28 Jan 2017 11:56:54 +0100 (CET) From: Simon Wunderlich <sw@simonwunderlich.de> To: davem@davemloft.net Date: Sat, 28 Jan 2017 11:56:49 +0100 Message-Id: <20170128105651.3061-1-sw@simonwunderlich.de> X-Mailer: git-send-email 2.11.0 Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org Subject: [B.A.T.M.A.N.] [PATCH 0/2] pull request for net-next: batman-adv 2017-01-28 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/batadv-next-for-davem-20170128Message
Simon Wunderlich
Jan. 28, 2017, 10:56 a.m. UTC
Hi David, here is another pull request for batman-adv in net-next. One of them fixes a regression introduced by a patch in the previous pull request two days ago. Please pull or let me know of any problem! Thank you, Simon The following changes since commit c33705188c493b7de3b8dc2956d67de91b444727: batman-adv: Treat NET_XMIT_CN as transmit successfully (2017-01-26 08:41:18 +0100) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20170128 for you to fetch changes up to 3e7514afc7d728dd47c5fe9d7a1f5216fe659cda: batman-adv: Fix includes for IS_ERR/ERR_PTR (2017-01-28 10:40:35 +0100) ---------------------------------------------------------------- Here are two fixes for batman-adv for net-next: - fix double call of dev_queue_xmit(), caused by the recent introduction of net_xmit_eval(), by Sven Eckelmann - Fix includes for IS_ERR/ERR_PTR, by Sven Eckelmann ---------------------------------------------------------------- Sven Eckelmann (2): batman-adv: Fix double call of dev_queue_xmit batman-adv: Fix includes for IS_ERR/ERR_PTR net/batman-adv/debugfs.c | 2 +- net/batman-adv/send.c | 4 +++- net/batman-adv/tp_meter.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-)
Comments
From: Simon Wunderlich <sw@simonwunderlich.de> Date: Sat, 28 Jan 2017 11:56:49 +0100 > here is another pull request for batman-adv in net-next. One of them fixes > a regression introduced by a patch in the previous pull request two days ago. > > Please pull or let me know of any problem! Pulled, thanks Simon.