From patchwork Fri Apr 25 20:55:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cong Wang X-Patchwork-Id: 343003 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 E11AB140083 for ; Sat, 26 Apr 2014 06:56:02 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932115AbaDYUzs (ORCPT ); Fri, 25 Apr 2014 16:55:48 -0400 Received: from mail-pb0-f41.google.com ([209.85.160.41]:44193 "EHLO mail-pb0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754981AbaDYUzo (ORCPT ); Fri, 25 Apr 2014 16:55:44 -0400 Received: by mail-pb0-f41.google.com with SMTP id rr13so3608578pbb.14 for ; Fri, 25 Apr 2014 13:55:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=98Pkl5gbyPRcFJQIdNJ7jE1fo8w4ExF/I6dDcGe74bY=; b=LxRoY2whbRymIDHIrihM9SnD8NFGDp4OsViThvGcET/RRCzoa1gN9cN2cTfDF+uSw3 bKiA/E4LJvGJqfKTOt0kVROcltn8bLuVyv1y4rr9PShR2T4IMTkXa6Jfn0+bAvKHcf14 Oegp+f/XSeyYbtFcRIoP4vUDEyjzmgeTvwK2xy8h8Mp3/RBVSVqSjFqeORI3vYXGsdCZ fBLVdTpPYHqaZWMQ6xzg5En9gnzQjUMrbInfDJZ8feK4GLJquLnp1dpnow3enejTbUUR 2FJr8xEB5F7KOdqrn+b0lumRy/wkqy92eeUl93PJu7jrO7zfLXzcemkX7gUWjJPLuRhD R14Q== X-Received: by 10.68.211.233 with SMTP id nf9mr10376504pbc.29.1398459344457; Fri, 25 Apr 2014 13:55:44 -0700 (PDT) Received: from localhost.net ([8.25.197.25]) by mx.google.com with ESMTPSA id ci4sm17951989pbb.50.2014.04.25.13.55.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Apr 2014 13:55:43 -0700 (PDT) From: Cong Wang To: netdev@vger.kernel.org Cc: Cong Wang , Jamal Hadi Salim , "David S. Miller" , Cong Wang Subject: [Patch net-next] sched, act: allow to clear all actions as well Date: Fri, 25 Apr 2014 13:55:30 -0700 Message-Id: <1398459330-15598-1-git-send-email-xiyou.wangcong@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Cong Wang When we change the list of action on a given filter, currently we don't change it to empty. This is a bug, we should allow to change to whatever users given. Cc: Jamal Hadi Salim Cc: David S. Miller Signed-off-by: Cong Wang Signed-off-by: Cong Wang Signed-off-by: Jamal Hadi Salim --- net/sched/cls_api.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 6786130..a481bbe 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -544,14 +544,12 @@ void tcf_exts_change(struct tcf_proto *tp, struct tcf_exts *dst, struct tcf_exts *src) { #ifdef CONFIG_NET_CLS_ACT - if (!list_empty(&src->actions)) { - LIST_HEAD(tmp); - tcf_tree_lock(tp); - list_splice_init(&dst->actions, &tmp); - list_splice(&src->actions, &dst->actions); - tcf_tree_unlock(tp); - tcf_action_destroy(&tmp, TCA_ACT_UNBIND); - } + LIST_HEAD(tmp); + tcf_tree_lock(tp); + list_splice_init(&dst->actions, &tmp); + list_splice(&src->actions, &dst->actions); + tcf_tree_unlock(tp); + tcf_action_destroy(&tmp, TCA_ACT_UNBIND); #endif } EXPORT_SYMBOL(tcf_exts_change);