From patchwork Fri Feb 14 08:36:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yingliang X-Patchwork-Id: 320324 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 9A9262C0078 for ; Fri, 14 Feb 2014 19:36:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751993AbaBNIgZ (ORCPT ); Fri, 14 Feb 2014 03:36:25 -0500 Received: from szxga01-in.huawei.com ([119.145.14.64]:45267 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751643AbaBNIgW (ORCPT ); Fri, 14 Feb 2014 03:36:22 -0500 Received: from 172.24.2.119 (EHLO szxeml214-edg.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id BRI43690; Fri, 14 Feb 2014 16:36:17 +0800 (CST) Received: from SZXEML402-HUB.china.huawei.com (10.82.67.32) by szxeml214-edg.china.huawei.com (172.24.2.29) with Microsoft SMTP Server (TLS) id 14.3.158.1; Fri, 14 Feb 2014 16:36:17 +0800 Received: from localhost (10.177.18.231) by szxeml402-hub.china.huawei.com (10.82.67.32) with Microsoft SMTP Server id 14.3.158.1; Fri, 14 Feb 2014 16:36:13 +0800 From: Yang Yingliang To: CC: , Subject: [PATCH net-next 1/7] sch_netem: clear old clgstate when old qdisc's replaced Date: Fri, 14 Feb 2014 16:36:04 +0800 Message-ID: <1392366970-11592-2-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 clgstate options, while we use "#tc qdisc replace ..." that without clgstate options to replace the old qdisc, the old clgstate's value is still there. We need clear these values after qdisc's replaced. Signed-off-by: Yang Yingliang --- net/sched/sch_netem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index 4fced67..6f2cc04 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -845,6 +845,7 @@ static int netem_change(struct Qdisc *sch, struct nlattr *opt) } } else { q->loss_model = CLG_RANDOM; + memset(&q->clg, 0, sizeof(q->clg)); } if (tb[TCA_NETEM_DELAY_DIST]) {