From patchwork Thu Oct 30 13:05:37 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarek Poplawski X-Patchwork-Id: 6491 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 F1332DDDEF for ; Fri, 31 Oct 2008 00:05:47 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754055AbYJ3NFn (ORCPT ); Thu, 30 Oct 2008 09:05:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754028AbYJ3NFn (ORCPT ); Thu, 30 Oct 2008 09:05:43 -0400 Received: from nf-out-0910.google.com ([64.233.182.189]:35682 "EHLO nf-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754026AbYJ3NFm (ORCPT ); Thu, 30 Oct 2008 09:05:42 -0400 Received: by nf-out-0910.google.com with SMTP id d3so256207nfc.21 for ; Thu, 30 Oct 2008 06:05:41 -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:x-mutt-fcc :x-mutt-fcc:user-agent; bh=kEuLiueeboPTUv4kaWiPzRyRkDR1Xm+dET6dfF4LSAY=; b=FKUQfFWsNDYseTJZchfVLVCwGRcd0NKSp5iNlNhEIs049uFHMVebZ5mBCi80ur8mcZ QMuckNMSjm/gI5dg1QNZmoVKlnqbAhfm5uime8K6muJmYZ99MrrbgT7u5iwIifZGiBvF ESeDkgYoLHAU9en36eiSMtcGt1eMVWzWAGa5k= 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:x-mutt-fcc:user-agent; b=NNdkO7MGIkLdq5uuDgsx97zDV1UiOkLzDN5F2QAQrORxiLjaUl7WvPtQnnJhz1Ytiq Od/XZoBjEu4F381spujBnwt6fK/mdmsno7s8QOh2vmaatg1Kwxs+wQHmJrWod5Flj+Kx Vo67FaPt8ldOUL6rxQ0Di5ePdCrFny6oIA6i0= Received: by 10.210.89.4 with SMTP id m4mr7159969ebb.15.1225371941467; Thu, 30 Oct 2008 06:05:41 -0700 (PDT) Received: from ff.dom.local (bv170.internetdsl.tpnet.pl [80.53.205.170]) by mx.google.com with ESMTPS id 7sm1823709eyg.0.2008.10.30.06.05.40 (version=SSLv3 cipher=RC4-MD5); Thu, 30 Oct 2008 06:05:41 -0700 (PDT) Date: Thu, 30 Oct 2008 13:05:37 +0000 From: Jarek Poplawski To: Patrick McHardy Cc: David Miller , netdev@vger.kernel.org, Herbert Xu Subject: [PATCH 1/6 RESEND] pkt_sched: sch_generic: Add Qdisc_ops peek() method. Message-ID: <20081030130537.GB22853@ff.dom.local> MIME-Version: 1.0 Content-Disposition: inline X-Mutt-Fcc: =outbox 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 Add Qdisc_ops peek() method in order to replace requeuing. Based on ideas and patches of Herbert Xu, Patrick McHardy and David S. Miller. Signed-off-by: Jarek Poplawski --- include/net/sch_generic.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 3fe49d8..f81f7c4 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -111,6 +111,7 @@ struct Qdisc_ops int (*enqueue)(struct sk_buff *, struct Qdisc *); struct sk_buff * (*dequeue)(struct Qdisc *); + struct sk_buff * (*peek)(struct Qdisc *); int (*requeue)(struct sk_buff *, struct Qdisc *); unsigned int (*drop)(struct Qdisc *);