lkml.org 
[lkml]   [2015]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 2/2] batman-adv: Less checks in batadv_tvlv_unicast_send()
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Sun, 15 Nov 2015 09:00:42 +0100

    * Let us return directly if a call of the batadv_orig_hash_find() function
    returned a null pointer.

    * Omit the initialisation for the variable "skb" at the beginning.

    * Replace an assignment by a call of the kfree_skb() function
    and delete the affected variable "ret" then.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    net/batman-adv/main.c | 15 +++++----------
    1 file changed, 5 insertions(+), 10 deletions(-)

    diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
    index 9e9b8f6..4eaa09a 100644
    --- a/net/batman-adv/main.c
    +++ b/net/batman-adv/main.c
    @@ -1143,15 +1143,14 @@ void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, u8 *src,
    struct batadv_unicast_tvlv_packet *unicast_tvlv_packet;
    struct batadv_tvlv_hdr *tvlv_hdr;
    struct batadv_orig_node *orig_node;
    - struct sk_buff *skb = NULL;
    + struct sk_buff *skb;
    unsigned char *tvlv_buff;
    unsigned int tvlv_len;
    ssize_t hdr_len = sizeof(*unicast_tvlv_packet);
    - bool ret = false;

    orig_node = batadv_orig_hash_find(bat_priv, dst);
    if (!orig_node)
    - goto out;
    + return;

    tvlv_len = sizeof(*tvlv_hdr) + tvlv_value_len;

    @@ -1180,14 +1179,10 @@ void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, u8 *src,
    tvlv_buff += sizeof(*tvlv_hdr);
    memcpy(tvlv_buff, tvlv_value, tvlv_value_len);

    - if (batadv_send_skb_to_orig(skb, orig_node, NULL) != NET_XMIT_DROP)
    - ret = true;
    -
    -out:
    - if (!ret)
    + if (batadv_send_skb_to_orig(skb, orig_node, NULL) == NET_XMIT_DROP)
    kfree_skb(skb);
    - if (orig_node)
    - batadv_orig_node_free_ref(orig_node);
    +out:
    + batadv_orig_node_free_ref(orig_node);
    }

    /**
    --
    2.6.2


    \
     
     \ /
      Last update: 2015-11-15 10:01    [W:4.016 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site