lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <1479740469-3797-1-git-send-email-fgao@ikuai8.com> Date: Mon, 21 Nov 2016 23:01:09 +0800 From: fgao@...ai8.com To: mareklindner@...mailbox.ch, sw@...onwunderlich.de, a@...table.cc, davem@...emloft.net, b.a.t.m.a.n@...ts.open-mesh.org, netdev@...r.kernel.org, gfree.wind@...il.com Subject: [PATCH net-next 2/2] net: batman-adv: Remove one condition check in batadv_route_unicast_packet From: Gao Feng <gfree.wind@...il.com> It could decrease one condition check to collect some statements in the first condition block. Signed-off-by: Gao Feng <gfree.wind@...il.com> --- 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 6b08b26..9d657cf 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: -- 1.9.1
Powered by blists - more mailing lists