From patchwork Tue Oct 14 09:54:12 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarek Poplawski X-Patchwork-Id: 4431 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 DEB61DE139 for ; Tue, 14 Oct 2008 20:54:24 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755059AbYJNJyU (ORCPT ); Tue, 14 Oct 2008 05:54:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755054AbYJNJyT (ORCPT ); Tue, 14 Oct 2008 05:54:19 -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 S1754980AbYJNJyS (ORCPT ); Tue, 14 Oct 2008 05:54:18 -0400 Received: by ug-out-1314.google.com with SMTP id k3so850192ugf.37 for ; Tue, 14 Oct 2008 02:54:17 -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=yTZQ0ElrUrjxGZwK0b0qm5J2+q9WC4l1vbuqePk7fkM=; b=qBKoVSWNK5mHeC4ciDBQhBsyhHL2NfcZmV7rP6C1Y2pVLqEYknbNgvpEFORWADVb2U 2fILFhT30arNUHpvFCveX8fmDMCar8zEHWAAAMM2vUBFTFC2ps7VaItEKdWxinifY7UG HxG8Bp9+Qu0dLxplEwll4nXUo3dITc1taAK9Y= 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=R0fR9D7DSCggJK+RsE+YCFfDDMMg6nV2uWfw69Cfq3rtzVAWRBDoItxIaBlBAQxkiJ hrj2JkgYHOMp3A3yDgGvRS2+9HuuUms+QLiAi7sHDH65DGBADrDTv4sCoOXKw7lHyFzP QyhsVpPWBZnHHTbYj0GvDIm8dni+9eupSB6eg= Received: by 10.66.184.33 with SMTP id h33mr4145714ugf.82.1223978056645; Tue, 14 Oct 2008 02:54:16 -0700 (PDT) Received: from ff.dom.local (bv170.internetdsl.tpnet.pl [80.53.205.170]) by mx.google.com with ESMTPS id y7sm1017090ugc.2.2008.10.14.02.54.15 (version=SSLv3 cipher=RC4-MD5); Tue, 14 Oct 2008 02:54:16 -0700 (PDT) Date: Tue, 14 Oct 2008 09:54:12 +0000 From: Jarek Poplawski To: David Miller Cc: netdev@vger.kernel.org Subject: [PATCH 06/14] sch_atm: Use ->requeue queue instead of ops. Message-ID: <20081014095412.GG10804@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 7/9]: sch_atm: Use ->requeue queue instead of ops. Date: Mon, 18 Aug 2008 01:37:12 -0700 (PDT) From: David Miller -------------------> From: David Miller sch_atm: Use ->requeue queue instead of ops. Signed-off-by: Jarek Poplawski --- net/sched/sch_atm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c index ca3467b..c8bc5fc 100644 --- a/net/sched/sch_atm.c +++ b/net/sched/sch_atm.c @@ -482,7 +482,7 @@ static void sch_atm_dequeue(unsigned long data) */ while ((skb = qdisc_dequeue(flow->q))) { if (!atm_may_send(flow->vcc, skb->truesize)) { - (void)flow->q->ops->requeue(skb, flow->q); + __skb_queue_tail(&flow->q->requeue, skb); break; } pr_debug("atm_tc_dequeue: sending on class %p\n", flow);