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>

diff --git a/net/sched/sch_multiq.c b/net/sched/sch_multiq.c
index 5d9cd68e91d1a95f18eb5100d74bafd334453047..915f3149dde23c6d5391d505ae957714961cd2d1 100644 (file)
--- 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))