Repository : ssh://git@open-mesh.org/batman-adv

On branches: ecsv/pu,master

commit eab7617142d2ff1a8a29592e260b064d545ee896 Author: Gao Feng gfree.wind@gmail.com Date: Mon Nov 21 23:01:09 2016 +0800

batman-adv: Remove one condition check in batadv_route_unicast_packet

It could decrease one condition check to collect some statements in the first condition block.

Signed-off-by: Gao Feng gfree.wind@gmail.com Signed-off-by: Sven Eckelmann sven@narfation.org

eab7617142d2ff1a8a29592e260b064d545ee896 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: