From patchwork Fri Feb 14 08:36:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yingliang X-Patchwork-Id: 320330 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 7AE9A2C0078 for ; Fri, 14 Feb 2014 19:36:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751973AbaBNIgZ (ORCPT ); Fri, 14 Feb 2014 03:36:25 -0500 Received: from szxga01-in.huawei.com ([119.145.14.64]:45265 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751668AbaBNIgW (ORCPT ); Fri, 14 Feb 2014 03:36:22 -0500 Received: from 172.24.2.119 (EHLO szxeml211-edg.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id BRI43691; Fri, 14 Feb 2014 16:36:17 +0800 (CST) Received: from SZXEML401-HUB.china.huawei.com (10.82.67.31) by szxeml211-edg.china.huawei.com (172.24.2.182) with Microsoft SMTP Server (TLS) id 14.3.158.1; Fri, 14 Feb 2014 16:36:16 +0800 Received: from localhost (10.177.18.231) by szxeml401-hub.china.huawei.com (10.82.67.31) 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 2/7] sch_netem: clear old dist table when old qdisc's replaced Date: Fri, 14 Feb 2014 16:36:05 +0800 Message-ID: <1392366970-11592-3-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 dist table option, while we use "#tc qdisc replace ..." that without dist table option to replace the old qdisc, the old dist table is still there. We need clear dist table after qdisc's replaced. Signed-off-by: Yang Yingliang --- net/sched/sch_netem.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index 6f2cc04..fd2206d 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -859,6 +859,9 @@ static int netem_change(struct Qdisc *sch, struct nlattr *opt) q->loss_model = old_loss_model; return ret; } + } else { + dist_free(q->delay_dist); + q->delay_dist = NULL; } sch->limit = qopt->limit;