From patchwork Tue Aug 28 13:06:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 2305 Return-Path: Received: from mail-qa0-f41.google.com (mail-qa0-f41.google.com [209.85.216.41]) by open-mesh.org (Postfix) with ESMTPS id 25B7D6007C9 for ; Tue, 28 Aug 2012 15:06:10 +0200 (CEST) Authentication-Results: open-mesh.org; dkim=pass reason="2048-bit key; insecure key" header.i=@gmail.com header.b=ENYqEDXD; dkim-adsp=pass; dkim-atps=neutral Received: by qafk30 with SMTP id k30so2976283qaf.14 for ; Tue, 28 Aug 2012 06:06:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=KjtATiAZW4VrFEUZF9zYA+6U84n4PjFJxADDvlHKGEo=; b=ENYqEDXDK/6I2e9qphPVrhYF5B8wW/a/t7Bl/Y22K4/R3XJy9/RcA3zFnMiSc8vn1W Mg8mWbLegaM23h43mGez2Z4pqUYLXeoFveKvzkTavypm5kfZ0dgfcU6r97ZWdxo2GCJB NBGTK08dtgDIA+kpVeywVe7AZVgvnmq+70bZMC2Qgo2XJ/wdFWFfZz4Fi5xdAijs7THv xlt9xMkK6ZOPnvjBDPtEGMYgZtWcw9naEVUoqVuhzjOhTfVebuAyWgW+2mIWTR41biKk 1g45GnPZLm6D1ZkspaUDnbfo8rapjqZRi/BiX+xmoKhlIloqWN4KWPVLqJwnnN9A2d3k OU3w== MIME-Version: 1.0 Received: by 10.224.193.132 with SMTP id du4mr29666699qab.75.1346159168331; Tue, 28 Aug 2012 06:06:08 -0700 (PDT) Received: by 10.229.146.194 with HTTP; Tue, 28 Aug 2012 06:06:08 -0700 (PDT) Date: Tue, 28 Aug 2012 21:06:08 +0800 Message-ID: From: Wei Yongjun To: lindner_marek@yahoo.de, siwu@hrz.tu-chemnitz.de, ordex@autistici.org, davem@davemloft.net X-Mailman-Approved-At: Tue, 28 Aug 2012 15:09:58 +0200 Cc: netdev@vger.kernel.org, yongjun_wei@trendmicro.com.cn, b.a.t.m.a.n@lists.open-mesh.org Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: remove pointless conditional before kfree_skb() X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Aug 2012 13:06:10 -0000 From: Wei Yongjun Remove pointless conditional before kfree_skb(). Signed-off-by: Wei Yongjun Acked-by: Antonio Quartulli --- net/batman-adv/send.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 3b4b2da..534dc46 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -99,8 +99,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); kfree(forw_packet);