From patchwork Fri Feb 14 08:36:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yingliang X-Patchwork-Id: 320327 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 172772C0078 for ; Fri, 14 Feb 2014 19:36:40 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752065AbaBNIg2 (ORCPT ); Fri, 14 Feb 2014 03:36:28 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:58745 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751815AbaBNIg1 (ORCPT ); Fri, 14 Feb 2014 03:36:27 -0500 Received: from 172.24.2.119 (EHLO szxeml207-edg.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id BPU42830; Fri, 14 Feb 2014 16:36:19 +0800 (CST) Received: from SZXEML415-HUB.china.huawei.com (10.82.67.154) by szxeml207-edg.china.huawei.com (172.24.2.56) with Microsoft SMTP Server (TLS) id 14.3.158.1; Fri, 14 Feb 2014 16:36:15 +0800 Received: from localhost (10.177.18.231) by szxeml415-hub.china.huawei.com (10.82.67.154) with Microsoft SMTP Server id 14.3.158.1; Fri, 14 Feb 2014 16:36:14 +0800 From: Yang Yingliang To: CC: , Subject: [PATCH net-next 3/7] sch_netem: clear old reorder when old qdisc's replaced Date: Fri, 14 Feb 2014 16:36:06 +0800 Message-ID: <1392366970-11592-4-git-send-email-yangyingliang@huawei.com> X-Mailer: git-send-email 1.8.1.msysgit.1 In-Reply-To: <1392366970-11592-1-git-send-email-yangyingliang@huawei.com> References: <1392366970-11592-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 If we set a netem qdisc with reorder option, while we use "#tc qdisc replace ..." that without reorder option to replace the old qdisc, the old reorder is still there. We need clear old reorder after qdisc's replaced. Signed-off-by: Yang Yingliang --- net/sched/sch_netem.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index fd2206d..bb06dd8 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -711,6 +711,12 @@ static void get_reorder(struct netem_sched_data *q, const struct nlattr *attr) init_crandom(&q->reorder_cor, r->correlation); } +static void reorder_reset(struct netem_sched_data *q) +{ + q->reorder = 0; + memset(&q->reorder_cor, 0, sizeof(struct crndstate)); +} + static void get_corrupt(struct netem_sched_data *q, const struct nlattr *attr) { const struct tc_netem_corrupt *r = nla_data(attr); @@ -879,12 +885,16 @@ static int netem_change(struct Qdisc *sch, struct nlattr *opt) */ if (q->gap) q->reorder = ~0; + else + q->reorder = 0; if (tb[TCA_NETEM_CORR]) get_correlation(q, tb[TCA_NETEM_CORR]); if (tb[TCA_NETEM_REORDER]) get_reorder(q, tb[TCA_NETEM_REORDER]); + else + reorder_reset(q); if (tb[TCA_NETEM_CORRUPT]) get_corrupt(q, tb[TCA_NETEM_CORRUPT]);