Patchwork multiq: requeue should rewind the current_band

login
register
mail settings
Submitter Alexander Duyck
Date Sept. 19, 2008, 12:43 a.m.
Message ID <20080919004322.10002.33219.stgit@localhost.localdomain>
Download mbox | patch
Permalink /patch/580/
State Accepted
Delegated to: David Miller
Headers show

Comments

Alexander Duyck - Sept. 19, 2008, 12:43 a.m.
Currently dequeueing a packet and requeueing the same packet will cause a
David Miller - Sept. 21, 2008, 5:08 a.m.
From: Alexander Duyck <alexander.h.duyck@intel.com>
Date: Thu, 18 Sep 2008 17:43:22 -0700

> Currently dequeueing a packet and requeueing the same packet will cause a
> different packet to be pulled on the next dequeue.  This change forces
> requeue to rewind the current_band.
> 
> Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>

Applied to net-next-2.6, thanks Alexander.
--
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

Patch

different packet to be pulled on the next dequeue.  This change forces
requeue to rewind the current_band.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
---

 net/sched/sch_multiq.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/net/sched/sch_multiq.c b/net/sched/sch_multiq.c
index 5d9cd68..915f314 100644
--- a/net/sched/sch_multiq.c
+++ b/net/sched/sch_multiq.c
@@ -97,6 +97,7 @@  static int
 multiq_requeue(struct sk_buff *skb, struct Qdisc *sch)
 {
 	struct Qdisc *qdisc;
+	struct multiq_sched_data *q = qdisc_priv(sch);
 	int ret;
 
 	qdisc = multiq_classify(skb, sch, &ret);
@@ -113,6 +114,10 @@  multiq_requeue(struct sk_buff *skb, struct Qdisc *sch)
 	if (ret == NET_XMIT_SUCCESS) {
 		sch->q.qlen++;
 		sch->qstats.requeues++;
+		if (q->curband)
+			q->curband--;
+		else
+			q->curband = q->bands - 1;
 		return NET_XMIT_SUCCESS;
 	}
 	if (net_xmit_drop_count(ret))