From patchwork Tue Mar 31 08:09:19 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 25348 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 3467CDDDA5 for ; Tue, 31 Mar 2009 19:10:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753045AbZCaIKl (ORCPT ); Tue, 31 Mar 2009 04:10:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752757AbZCaIKk (ORCPT ); Tue, 31 Mar 2009 04:10:40 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:65207 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752455AbZCaIKj (ORCPT ); Tue, 31 Mar 2009 04:10:39 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 2DA1B17014E; Tue, 31 Mar 2009 16:49:00 +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 n2V8Cxjn017537; Tue, 31 Mar 2009 16:12:59 +0800 Received: from [127.0.0.1] (unknown [10.167.141.76]) by fnst.cn.fujitsu.com (Postfix) with ESMTP id 39719D4016; Tue, 31 Mar 2009 16:14:43 +0800 (CST) Message-ID: <49D1CFAF.4030109@cn.fujitsu.com> Date: Tue, 31 Mar 2009 16:09:19 +0800 From: Wei Yongjun User-Agent: Thunderbird 2.0.0.6 (Windows/20070728) MIME-Version: 1.0 To: David Miller CC: netdev@vger.kernel.org Subject: [PATCH] core: remove pointless conditional before kfree() Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove pointless conditional before kfree(). Signed-off-by: Wei Yongjun --- net/core/ethtool.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 244ca56..d9d5160 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -261,8 +261,7 @@ static int ethtool_get_rxnfc(struct net_device *dev, void __user *useraddr) ret = 0; err_out: - if (rule_buf) - kfree(rule_buf); + kfree(rule_buf); return ret; }