From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Wunderlich Subject: [PATCH 3/7] batman-adv: Remove one condition check in batadv_route_unicast_packet Date: Wed, 25 Jan 2017 17:42:59 +0100 Message-ID: <20170125164303.14268-4-sw@simonwunderlich.de> References: <20170125164303.14268-1-sw@simonwunderlich.de> Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org, Gao Feng , Sven Eckelmann , Simon Wunderlich To: davem@davemloft.net Return-path: Received: from packetmixer.de ([79.140.42.25]:49230 "EHLO mail.mail.packetmixer.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751602AbdAYQnM (ORCPT ); Wed, 25 Jan 2017 11:43:12 -0500 In-Reply-To: <20170125164303.14268-1-sw@simonwunderlich.de> Sender: netdev-owner@vger.kernel.org List-ID: From: Gao Feng It could decrease one condition check to collect some statements in the first condition block. Signed-off-by: Gao Feng Signed-off-by: Sven Eckelmann Signed-off-by: Simon Wunderlich --- net/batman-adv/routing.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 6b08b26da4d9..9d657cff93de 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -719,20 +719,18 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, len = skb->len; res = batadv_send_skb_to_orig(skb, orig_node, recv_if); - if (res == NET_XMIT_SUCCESS || res == NET_XMIT_CN) - ret = NET_RX_SUCCESS; - - /* skb was consumed */ - skb = NULL; - /* translate transmit result into receive result */ if (res == NET_XMIT_SUCCESS || res == NET_XMIT_CN) { + ret = NET_RX_SUCCESS; /* skb was transmitted and consumed */ batadv_inc_counter(bat_priv, BATADV_CNT_FORWARD); batadv_add_counter(bat_priv, BATADV_CNT_FORWARD_BYTES, len + ETH_HLEN); } + /* skb was consumed */ + skb = NULL; + put_orig_node: batadv_orig_node_put(orig_node); free_skb: -- 2.11.0