From patchwork Wed Feb 25 10:31:04 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 23697 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.176.167]) by ozlabs.org (Postfix) with ESMTP id C6599DDEDD for ; Wed, 25 Feb 2009 21:32:16 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755715AbZBYKbi (ORCPT ); Wed, 25 Feb 2009 05:31:38 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762306AbZBYKbi (ORCPT ); Wed, 25 Feb 2009 05:31:38 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:64191 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1762611AbZBYKbh (ORCPT ); Wed, 25 Feb 2009 05:31:37 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 6597E170116; Wed, 25 Feb 2009 18:44:01 +0800 (CST) Received: from fnst.cn.fujitsu.com (localhost.localdomain [127.0.0.1]) by tang.cn.fujitsu.com (8.13.1/8.13.1) with ESMTP id n1PAX3mE009688; Wed, 25 Feb 2009 18:33:03 +0800 Received: from [127.0.0.1] (unknown [10.167.141.76]) by fnst.cn.fujitsu.com (Postfix) with ESMTP id 62315EC007; Wed, 25 Feb 2009 18:31:47 +0800 (CST) Message-ID: <49A51DE8.406@cn.fujitsu.com> Date: Wed, 25 Feb 2009 18:31:04 +0800 From: Wei Yongjun User-Agent: Thunderbird 2.0.0.6 (Windows/20070728) MIME-Version: 1.0 To: David Miller , netdev@vger.kernel.org Subject: [PATCH] af_key: remove some pointless conditionals before kfree_skb() Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove some pointless conditionals before kfree_skb(). Signed-off-by: Wei Yongjun --- net/key/af_key.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/net/key/af_key.c b/net/key/af_key.c index 7dcbde3..643c1be 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -313,8 +313,7 @@ static int pfkey_broadcast(struct sk_buff *skb, gfp_t allocation, if (one_sk != NULL) err = pfkey_broadcast_one(skb, &skb2, allocation, one_sk); - if (skb2) - kfree_skb(skb2); + kfree_skb(skb2); kfree_skb(skb); return err; } @@ -3573,8 +3572,7 @@ static int pfkey_sendmsg(struct kiocb *kiocb, out: if (err && hdr && pfkey_error(hdr, err, sk) == 0) err = 0; - if (skb) - kfree_skb(skb); + kfree_skb(skb); return err ? : len; }