diff options
| author | Gao Feng <gfree.wind@gmail.com> | 2016-11-21 18:01:09 +0300 |
|---|---|---|
| committer | Simon Wunderlich <sw@simonwunderlich.de> | 2017-01-26 10:37:01 +0300 |
| commit | 0843f197c46dd3c432a3202de80e8bc1fcb96a6b (patch) | |
| tree | cb3a4a35dc52e8b843eddc80c35457f925fb1920 /net/batman-adv | |
| parent | 269cee621847a09b9cfcdb6469ff9b546efbcac1 (diff) | |
| download | linux-0843f197c46dd3c432a3202de80e8bc1fcb96a6b.tar.xz | |
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>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Diffstat (limited to 'net/batman-adv')
| -rw-r--r-- | net/batman-adv/routing.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 5f050fbdfff7..7fd740b6e36d 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -719,20 +719,19 @@ 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) - ret = NET_RX_SUCCESS; - - /* skb was consumed */ - skb = NULL; /* translate transmit result into receive result */ if (res == NET_XMIT_SUCCESS) { + 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: |