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: 180481 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5C6EC2C00D2 for ; Tue, 28 Aug 2012 23:06:15 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752575Ab2H1NGK (ORCPT ); Tue, 28 Aug 2012 09:06:10 -0400 Received: from mail-qa0-f53.google.com ([209.85.216.53]:58588 "EHLO mail-qa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752261Ab2H1NGI (ORCPT ); Tue, 28 Aug 2012 09:06:08 -0400 Received: by qaas11 with SMTP id s11so2611837qaa.19 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: Subject: [PATCH] batman-adv: remove pointless conditional before kfree_skb() From: Wei Yongjun To: lindner_marek@yahoo.de, siwu@hrz.tu-chemnitz.de, ordex@autistici.org, davem@davemloft.net Cc: yongjun_wei@trendmicro.com.cn, b.a.t.m.a.n@lists.open-mesh.org, netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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);