From patchwork Thu Mar 6 13:08:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yingliang X-Patchwork-Id: 327423 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 885A72C0325 for ; Fri, 7 Mar 2014 00:08:57 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751365AbaCFNIw (ORCPT ); Thu, 6 Mar 2014 08:08:52 -0500 Received: from szxga01-in.huawei.com ([119.145.14.64]:13553 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751065AbaCFNIu (ORCPT ); Thu, 6 Mar 2014 08:08:50 -0500 Received: from 172.24.2.119 (EHLO szxeml210-edg.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id BSG39395; Thu, 06 Mar 2014 21:08:48 +0800 (CST) Received: from SZXEML456-HUB.china.huawei.com (10.82.67.199) by szxeml210-edg.china.huawei.com (172.24.2.183) with Microsoft SMTP Server (TLS) id 14.3.158.1; Thu, 6 Mar 2014 21:08:44 +0800 Received: from localhost (10.177.18.231) by szxeml456-hub.china.huawei.com (10.82.67.199) with Microsoft SMTP Server id 14.3.158.1; Thu, 6 Mar 2014 21:08:42 +0800 From: Yang Yingliang To: , CC: , Subject: [PATCH net-next 1/5] net_sched: add flag parameter in qdisc_change Date: Thu, 6 Mar 2014 21:08:37 +0800 Message-ID: <1394111321-11192-2-git-send-email-yangyingliang@huawei.com> X-Mailer: git-send-email 1.8.1.msysgit.1 In-Reply-To: <1394111321-11192-1-git-send-email-yangyingliang@huawei.com> References: <1394111321-11192-1-git-send-email-yangyingliang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.18.231] X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add a new parameter for checking if it's "change" or "replace". Signed-off-by: Yang Yingliang --- net/sched/sch_api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 1313145e3b86..961cb0f1bd0c 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -993,7 +993,7 @@ err_out4: goto err_out3; } -static int qdisc_change(struct Qdisc *sch, struct nlattr **tca) +static int qdisc_change(struct Qdisc *sch, struct nlattr **tca, u16 flags) { struct qdisc_size_table *ostab, *stab = NULL; int err = 0; @@ -1248,7 +1248,7 @@ replay: return -EEXIST; if (tca[TCA_KIND] && nla_strcmp(tca[TCA_KIND], q->ops->id)) return -EINVAL; - err = qdisc_change(q, tca); + err = qdisc_change(q, tca, n->nlmsg_flags); if (err == 0) qdisc_notify(net, skb, n, clid, NULL, q); return err;