From patchwork Thu Jun 30 00:26:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Soltys X-Patchwork-Id: 642284 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 3rg0kw5ChNz9s9W for ; Thu, 30 Jun 2016 10:28:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751932AbcF3A14 (ORCPT ); Wed, 29 Jun 2016 20:27:56 -0400 Received: from drutsystem.com ([84.10.39.251]:50041 "EHLO drutsystem.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751491AbcF3A1b (ORCPT ); Wed, 29 Jun 2016 20:27:31 -0400 Received: from mott.hasevolq.tld (89-65-72-120.dynamic.chello.pl [89.65.72.120]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: nozo) by drutsystem.com (Postfix) with ESMTPSA id 19B646B038; Thu, 30 Jun 2016 02:26:50 +0200 (CEST) From: Michal Soltys To: davem@davemloft.net Cc: netdev@vger.kernel.org, kaber@trash.net Subject: [net-next PATCH 5/5] net/sched/sch_hfsc.c: anchor virtual curve at proper vt in hfsc_change_fsc() Date: Thu, 30 Jun 2016 02:26:48 +0200 Message-Id: <1467246408-913-6-git-send-email-soltys@ziu.info> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1467246408-913-1-git-send-email-soltys@ziu.info> References: <1467246408-913-1-git-send-email-soltys@ziu.info> X-MailScanner-ID: 19B646B038.AE116 X-MailScanner: Not scanned: please contact your Internet E-Mail Service Provider for details X-MailScanner-From: soltys@ziu.info X-Spam-Status: No Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org cl->cl_vt alone is relative only to the current backlog period, while the curve operates on cumulative virtual time. This patch adds missing cl->cl_vtoff. Signed-off-by: Michal Soltys --- net/sched/sch_hfsc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c index 4eef857..dff92ea 100644 --- a/net/sched/sch_hfsc.c +++ b/net/sched/sch_hfsc.c @@ -940,7 +940,7 @@ static void hfsc_change_fsc(struct hfsc_class *cl, struct tc_service_curve *fsc) { sc2isc(fsc, &cl->cl_fsc); - rtsc_init(&cl->cl_virtual, &cl->cl_fsc, cl->cl_vt, cl->cl_total); + rtsc_init(&cl->cl_virtual, &cl->cl_fsc, cl->cl_vtoff + cl->cl_vt, cl->cl_total); cl->cl_flags |= HFSC_FSC; }