From patchwork Wed Dec 3 07:09:47 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarek Poplawski X-Patchwork-Id: 11901 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 79569DDDED for ; Wed, 3 Dec 2008 18:10:00 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752867AbYLCHJz (ORCPT ); Wed, 3 Dec 2008 02:09:55 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752616AbYLCHJz (ORCPT ); Wed, 3 Dec 2008 02:09:55 -0500 Received: from nf-out-0910.google.com ([64.233.182.188]:63350 "EHLO nf-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752510AbYLCHJy (ORCPT ); Wed, 3 Dec 2008 02:09:54 -0500 Received: by nf-out-0910.google.com with SMTP id d3so1774891nfc.21 for ; Tue, 02 Dec 2008 23:09:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=LzSrtx70d+Il+tiyB3jgL0zUZApL8Lsvjm0yAwhhsjQ=; b=fzAdfQb1foHoaIKmN+ONtsE0bhE1V1r0SfrZqIfYaj3qgk5oyara9LCs8NYdUfszvh Q3RHdVVjqE0tJRTdDhsXLfLzvDLPN3AFAhZRJDGckaMaX8lJG/mVAqNisNuQaiSQViTB U6ZbpoOh5HHslYMtZup+bHcavUGmppk0T0U7U= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=ohxrg8X5KYRSAGUGN4MaUV/oB3L5mjj5lFDw24ZekpAauYmfwium7JeZYlFI2DuzlK PMBjMT1icWKOqU4Y3jvTDwDu2zQhb1ntaZb/oOqXFDLxKxvpFVRyn5Sbh4OqTxYgMX7a Iv/SneBdoYedkpv8k+pNjHVteVRqfJDkHb0g8= Received: by 10.210.43.11 with SMTP id q11mr9455346ebq.163.1228288192639; Tue, 02 Dec 2008 23:09:52 -0800 (PST) Received: from ff.dom.local (bv170.internetdsl.tpnet.pl [80.53.205.170]) by mx.google.com with ESMTPS id 5sm7436976nfv.15.2008.12.02.23.09.51 (version=SSLv3 cipher=RC4-MD5); Tue, 02 Dec 2008 23:09:52 -0800 (PST) Date: Wed, 3 Dec 2008 07:09:47 +0000 From: Jarek Poplawski To: David Miller Cc: Martin Devera , Patrick McHardy , netdev@vger.kernel.org Subject: [PATCH 4/3] pkt_sched: sch_htb: Clean L2T() Message-ID: <20081203070947.GA5598@ff.dom.local> References: <20081202085648.GC10412@ff.dom.local> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20081202085648.GC10412@ff.dom.local> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org L2T() is currently used only in one place, so let's move it closer to this place, remove unused cl parameter, and change to a macro. Signed-off-by: Jarek Poplawski --- net/sched/sch_htb.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 80cb94d..78f20d6 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -125,13 +125,6 @@ struct htb_class { psched_time_t t_c; /* checkpoint time */ }; -static inline long L2T(struct htb_class *cl, struct qdisc_rate_table *rate, - int size) -{ - long result = qdisc_l2t(rate, size); - return result; -} - struct htb_sched { struct Qdisc_class_hash clhash; struct list_head drops[TC_HTB_NUMPRIO];/* active leaves (for drops) */ @@ -602,9 +595,11 @@ static void htb_charge_class(struct htb_sched *q, struct htb_class *cl, long toks, diff; enum htb_cmode old_mode; +#define L2T(rate, size) ((long) qdisc_l2t(rate, size)) + #define HTB_ACCNT(T,B,R) toks = diff + cl->T; \ if (toks > cl->B) toks = cl->B; \ - toks -= L2T(cl, cl->R, bytes); \ + toks -= L2T(cl->R, bytes); \ if (toks <= -cl->mbuffer) toks = 1-cl->mbuffer; \ cl->T = toks