From patchwork Mon Jun 20 17:54:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 16388 X-Patchwork-Delegate: mareklindner@neomailbox.ch Return-Path: 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 E138C81D1B; Mon, 20 Jun 2016 19:54:57 +0200 (CEST) Authentication-Results: open-mesh.org; dmarc=none header.from=narfation.org Authentication-Results: open-mesh.org; dkim=fail reason="verification failed; unprotected key" header.d=narfation.org header.i=@narfation.org header.b=lHNwyBMm; dkim-adsp=fail (unprotected policy); dkim-atps=neutral Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2001:4d88:2000:7::2; 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; dmarc=pass header.from=narfation.org Received: from v3-1039.vlinux.de (narfation.org [IPv6:2001:4d88:2000:7::2]) by open-mesh.org (Postfix) with ESMTPS id B77F181D18 for ; Mon, 20 Jun 2016 19:54:55 +0200 (CEST) Received: from sven-desktop.home.narfation.org (p200300C593C047F90000000000002E16.dip0.t-ipconnect.de [IPv6:2003:c5:93c0:47f9::2e16]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 2498A1100E8; Mon, 20 Jun 2016 19:54:55 +0200 (CEST) Authentication-Results: v3-1039.vlinux.de; dmarc=none header.from=narfation.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=narfation.org; s=20121; t=1466445295; bh=x9H2annVh6wzMISmlL46BIq+hDQox7sYhGPZ869m6JI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lHNwyBMm09Y/uWe8a8w+24PbAgso6a+qFOALmbiSS1PUnr4No/uR3ySCcEo6JW++Q m8ZSFxVl6ivQsWlRppsR4D/OpJW9k2//fDjVeo0A2HD40i7NPie4BLaLQJX/VsNLMU NG0mXLHxxlZPc0VSifWhvC3DNcbwFGP6wXhhFOos= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Mon, 20 Jun 2016 19:54:48 +0200 Message-Id: <1466445289-17840-1-git-send-email-sven@narfation.org> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1466445210-17616-1-git-send-email-sven@narfation.org> References: <1466445210-17616-1-git-send-email-sven@narfation.org> Cc: Florian Westphal , "David S . Miller" Subject: [B.A.T.M.A.N.] [PATCH next v2 3/4] batman-adv: remove NET_XMIT_POLICED 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: , Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" From: Florian Westphal BATMAN uses it as an intermediate return value to signal forwarding vs. buffering, but it did not return POLICED to callers outside of BATMAN. Signed-off-by: Florian Westphal Signed-off-by: David S. Miller [sven@narfation.org: rebased on top of TX path rewrite] Signed-off-by: Sven Eckelmann --- v2: - rebased on current master - added patch to a common set of related patches net/batman-adv/send.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 70a8c1d..80208f1 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -20,6 +20,7 @@ #include #include +#include #include #include #include @@ -164,7 +165,7 @@ int batadv_send_unicast_skb(struct sk_buff *skb, * host, NULL can be passed as recv_if and no interface alternating is * attempted. * - * Return: -1 on failure (and the skb is not consumed), NET_XMIT_POLICED if the + * Return: -1 on failure (and the skb is not consumed), -EINPROGRESS if the * skb is buffered for later transmit or the NET_XMIT status returned by the * lower routine if the packet has been passed down. * @@ -199,7 +200,7 @@ int batadv_send_skb_to_orig(struct sk_buff *skb, * network coding fails, then send the packet as usual. */ if (recv_if && batadv_nc_skb_forward(skb, neigh_node)) - ret = NET_XMIT_POLICED; + ret = -EINPROGRESS; else ret = batadv_send_unicast_skb(skb, neigh_node);