aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2008-09-21 01:07:34 -0400
committerDavid S. Miller <davem@davemloft.net>2008-09-21 01:07:34 -0400
commita574420ff46cff0245e6b0fce2e961aa2717743d (patch)
tree5baf2134ac902803152c92733f8ed580dd9c7b75
parent618d9f25548ba6fc3a9cd2ce5cd56f4f015b0635 (diff)
multiq: requeue should rewind the current_band
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> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/sched/sch_multiq.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/sched/sch_multiq.c b/net/sched/sch_multiq.c
index 5d9cd68e91d1..915f3149dde2 100644
--- a/net/sched/sch_multiq.c
+++ b/net/sched/sch_multiq.c
@@ -97,6 +97,7 @@ static int
97multiq_requeue(struct sk_buff *skb, struct Qdisc *sch) 97multiq_requeue(struct sk_buff *skb, struct Qdisc *sch)
98{ 98{
99 struct Qdisc *qdisc; 99 struct Qdisc *qdisc;
100 struct multiq_sched_data *q = qdisc_priv(sch);
100 int ret; 101 int ret;
101 102
102 qdisc = multiq_classify(skb, sch, &ret); 103 qdisc = multiq_classify(skb, sch, &ret);
@@ -113,6 +114,10 @@ multiq_requeue(struct sk_buff *skb, struct Qdisc *sch)
113 if (ret == NET_XMIT_SUCCESS) { 114 if (ret == NET_XMIT_SUCCESS) {
114 sch->q.qlen++; 115 sch->q.qlen++;
115 sch->qstats.requeues++; 116 sch->qstats.requeues++;
117 if (q->curband)
118 q->curband--;
119 else
120 q->curband = q->bands - 1;
116 return NET_XMIT_SUCCESS; 121 return NET_XMIT_SUCCESS;
117 } 122 }
118 if (net_xmit_drop_count(ret)) 123 if (net_xmit_drop_count(ret))