From patchwork Wed Jun 18 08:48:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Duan Jiong X-Patchwork-Id: 361355 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 1132D14009A for ; Wed, 18 Jun 2014 18:52:01 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964819AbaFRIvz (ORCPT ); Wed, 18 Jun 2014 04:51:55 -0400 Received: from cn.fujitsu.com ([59.151.112.132]:50851 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S934202AbaFRIvv (ORCPT ); Wed, 18 Jun 2014 04:51:51 -0400 X-IronPort-AV: E=Sophos;i="5.00,730,1396972800"; d="scan'208";a="32081146" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 18 Jun 2014 16:49:09 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id s5I8pmFR009686; Wed, 18 Jun 2014 16:51:48 +0800 Received: from [10.167.225.86] (10.167.225.86) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server id 14.3.181.6; Wed, 18 Jun 2014 16:51:52 +0800 Message-ID: <53A15267.7050304@cn.fujitsu.com> Date: Wed, 18 Jun 2014 16:48:39 +0800 From: Duan Jiong User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: Rostislav Lisovy , David Miller CC: netdev Subject: [PATCH net-next] net: em_canid: remove useless statements from em_canid_change X-Originating-IP: [10.167.225.86] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org tcf_ematch is allocated by kzalloc in function tcf_em_tree_validate(), so cm_old is always NULL. Signed-off-by: Duan Jiong --- net/sched/em_canid.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/net/sched/em_canid.c b/net/sched/em_canid.c index bfd34e4..7c292d4 100644 --- a/net/sched/em_canid.c +++ b/net/sched/em_canid.c @@ -125,7 +125,6 @@ static int em_canid_change(struct tcf_proto *tp, void *data, int len, { struct can_filter *conf = data; /* Array with rules */ struct canid_match *cm; - struct canid_match *cm_old = (struct canid_match *)m->data; int i; if (!len) @@ -181,12 +180,6 @@ static int em_canid_change(struct tcf_proto *tp, void *data, int len, m->datalen = sizeof(struct canid_match) + len; m->data = (unsigned long)cm; - - if (cm_old != NULL) { - pr_err("canid: Configuring an existing ematch!\n"); - kfree(cm_old); - } - return 0; }