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 1/2] batman-adv: Delete unnecessary checks before the function call "kfree_skb"
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Sun, 15 Nov 2015 08:04:43 +0100

    The kfree_skb() function tests whether its argument is NULL and then
    returns immediately. Thus the test around the calls is not needed.

    This issue was detected by using the Coccinelle software.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    net/batman-adv/main.c | 2 +-
    net/batman-adv/network-coding.c | 4 +---
    net/batman-adv/send.c | 3 +--
    3 files changed, 3 insertions(+), 6 deletions(-)

    diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
    index d7f17c1..9e9b8f6 100644
    --- a/net/batman-adv/main.c
    +++ b/net/batman-adv/main.c
    @@ -1184,7 +1184,7 @@ void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, u8 *src,
    ret = true;

    out:
    - if (skb && !ret)
    + if (!ret)
    kfree_skb(skb);
    if (orig_node)
    batadv_orig_node_free_ref(orig_node);
    diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c
    index f5276be..c98b0ab 100644
    --- a/net/batman-adv/network-coding.c
    +++ b/net/batman-adv/network-coding.c
    @@ -244,9 +244,7 @@ static void batadv_nc_path_free_ref(struct batadv_nc_path *nc_path)
    */
    static void batadv_nc_packet_free(struct batadv_nc_packet *nc_packet)
    {
    - if (nc_packet->skb)
    - kfree_skb(nc_packet->skb);
    -
    + kfree_skb(nc_packet->skb);
    batadv_nc_path_free_ref(nc_packet->nc_path);
    kfree(nc_packet);
    }
    diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
    index f664324..782fa33 100644
    --- a/net/batman-adv/send.c
    +++ b/net/batman-adv/send.c
    @@ -407,8 +407,7 @@ void batadv_schedule_bat_ogm(struct batadv_hard_iface *hard_iface)

    static void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet)
    {
    - if (forw_packet->skb)
    - kfree_skb(forw_packet->skb);
    + kfree_skb(forw_packet->skb);
    if (forw_packet->if_incoming)
    batadv_hardif_free_ref(forw_packet->if_incoming);
    if (forw_packet->if_outgoing)
    --
    2.6.2


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