From patchwork Tue Oct 14 09:54:23 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarek Poplawski X-Patchwork-Id: 4432 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 7E86EDE052 for ; Tue, 14 Oct 2008 20:54:31 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755117AbYJNJya (ORCPT ); Tue, 14 Oct 2008 05:54:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755087AbYJNJy3 (ORCPT ); Tue, 14 Oct 2008 05:54:29 -0400 Received: from ug-out-1314.google.com ([66.249.92.170]:52657 "EHLO ug-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755054AbYJNJy2 (ORCPT ); Tue, 14 Oct 2008 05:54:28 -0400 Received: by ug-out-1314.google.com with SMTP id k3so850192ugf.37 for ; Tue, 14 Oct 2008 02:54:27 -0700 (PDT) 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:mime-version:content-type:content-disposition :in-reply-to:x-mutt-fcc:user-agent; bh=EzE4TfIJZ8npJqy0K9u0NAxUI4wVlQ09yerHjRbG92s=; b=oLbOT4TLFdtGr8Re5dT+ripgYZdBJdYsOhepUSW7LA7b7fQSTCbjNOYyAMIVgRy202 CS6HOlFXd52UtaN1Ofeekfn45ynGIqrS5ouZKTTOV0WDCGpPUo0GdIPuERwq3Yr4lurb Ood52uqqZeS82Oxu1LvZXMXjZagvkOWRdaiWw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:in-reply-to:x-mutt-fcc:user-agent; b=vIjsAXTCZ43568SlaRCOGOlCz4Q64zyoTVg2ba4fECvx1ZxOwz8p2VgLOqSIBlIH2e Ol6tz8gOyDo8Mdwxw23HniewjHlDpM5iws7Olqq5Km4Rd/6baemMU3GmsxGNcgptjLfl l7h0IPd14ib3j3XBb+XQX9jChJmFepp9ELrcU= Received: by 10.66.237.16 with SMTP id k16mr4146563ugh.84.1223978067333; Tue, 14 Oct 2008 02:54:27 -0700 (PDT) Received: from ff.dom.local (bv170.internetdsl.tpnet.pl [80.53.205.170]) by mx.google.com with ESMTPS id j34sm482118ugc.47.2008.10.14.02.54.26 (version=SSLv3 cipher=RC4-MD5); Tue, 14 Oct 2008 02:54:27 -0700 (PDT) Date: Tue, 14 Oct 2008 09:54:23 +0000 From: Jarek Poplawski To: David Miller Cc: netdev@vger.kernel.org Subject: [PATCH 07/14] sch_hfsc: Use ->requeue queue instead of ops. Message-ID: <20081014095423.GH10804@ff.dom.local> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mutt-Fcc: =outbox 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 -------- Original Message -------- Subject: [PATCH 8/9]: sch_hfsc: Use ->requeue queue instead of ops. Date: Mon, 18 Aug 2008 01:37:15 -0700 (PDT) From: David Miller ------------------> From: David Miller sch_hfsc: Use ->requeue queue instead of ops. In fact this "peek head SKB for len" sequence could be optimized even further. Signed-off-by: Jarek Poplawski --- net/sched/sch_hfsc.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c index 67aa3ea..87da751 100644 --- a/net/sched/sch_hfsc.c +++ b/net/sched/sch_hfsc.c @@ -896,12 +896,7 @@ qdisc_peek_len(struct Qdisc *sch) return 0; } len = qdisc_pkt_len(skb); - if (unlikely(sch->ops->requeue(skb, sch) != NET_XMIT_SUCCESS)) { - if (net_ratelimit()) - printk("qdisc_peek_len: failed to requeue\n"); - qdisc_tree_decrease_qlen(sch, 1); - return 0; - } + __skb_queue_head(&sch->requeue, skb); return len; }