{"id":580,"url":"http://patchwork.ozlabs.org/api/1.0/patches/580/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20080919004322.10002.33219.stgit@localhost.localdomain>","date":"2008-09-19T00:43:22","name":"multiq: requeue should rewind the current_band","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"932af01e123c4953dcf93b4403600d97c5343f65","submitter":{"id":251,"url":"http://patchwork.ozlabs.org/api/1.0/people/251/?format=json","name":"Duyck, Alexander H","email":"alexander.h.duyck@intel.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.0/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20080919004322.10002.33219.stgit@localhost.localdomain/mbox/","series":[],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/580/checks/","tags":{},"headers":{"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])\n\tby ozlabs.org (Postfix) with ESMTP id EFC16DDED2\n\tfor ;\n\tFri, 19 Sep 2008 10:43:29 +1000 (EST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1755655AbYISAnY (ORCPT );\n\tThu, 18 Sep 2008 20:43:24 -0400","(majordomo@vger.kernel.org) by vger.kernel.org id S1755825AbYISAnY\n\t(ORCPT ); Thu, 18 Sep 2008 20:43:24 -0400","from mga14.intel.com ([143.182.124.37]:12733 \"EHLO mga14.intel.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1755623AbYISAnY (ORCPT );\n\tThu, 18 Sep 2008 20:43:24 -0400","from azsmga001.ch.intel.com ([10.2.17.19])\n\tby azsmga102.ch.intel.com with ESMTP; 18 Sep 2008 17:43:23 -0700","from orsmsx334.amr.corp.intel.com (HELO orsmsx334.jf.intel.com)\n\t([10.22.226.45])\n\tby azsmga001.ch.intel.com with ESMTP; 18 Sep 2008 17:43:23 -0700","from localhost.localdomain ([10.23.35.60]) by\n\torsmsx334.jf.intel.com with Microsoft SMTPSVC(6.0.3790.1830); \n\tThu, 18 Sep 2008 17:43:22 -0700","from localhost.localdomain (gitlad [127.0.0.1])\n\tby localhost.localdomain (8.14.2/8.14.2) with ESMTP id m8J0hMkb010032;\n\tThu, 18 Sep 2008 17:43:22 -0700"],"X-ExtLoop1":"1","X-IronPort-AV":"E=Sophos;i=\"4.32,424,1217833200\"; d=\"scan'208\";a=\"48446819\"","From":"Alexander Duyck ","Subject":"[PATCH] multiq: requeue should rewind the current_band","To":"netdev@vger.kernel.org","Cc":"davem@davemloft.net","Date":"Thu, 18 Sep 2008 17:43:22 -0700","Message-ID":"<20080919004322.10002.33219.stgit@localhost.localdomain>","User-Agent":"StGIT/0.14.2","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"7bit","X-OriginalArrivalTime":"19 Sep 2008 00:43:22.0656 (UTC)\n\tFILETIME=[B7FF0A00:01C919F0]","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Currently dequeueing a packet and requeueing the same packet will cause a","diff":"different packet to be pulled on the next dequeue. This change forces\nrequeue to rewind the current_band.\n\nSigned-off-by: Alexander Duyck \n---\n\n net/sched/sch_multiq.c | 5 +++++\n 1 files changed, 5 insertions(+), 0 deletions(-)\n\ndiff --git a/net/sched/sch_multiq.c b/net/sched/sch_multiq.c\nindex 5d9cd68..915f314 100644\n--- a/net/sched/sch_multiq.c\n+++ b/net/sched/sch_multiq.c\n@@ -97,6 +97,7 @@ static int\n multiq_requeue(struct sk_buff *skb, struct Qdisc *sch)\n {\n \tstruct Qdisc *qdisc;\n+\tstruct multiq_sched_data *q = qdisc_priv(sch);\n \tint ret;\n \n \tqdisc = multiq_classify(skb, sch, &ret);\n@@ -113,6 +114,10 @@ multiq_requeue(struct sk_buff *skb, struct Qdisc *sch)\n \tif (ret == NET_XMIT_SUCCESS) {\n \t\tsch->q.qlen++;\n \t\tsch->qstats.requeues++;\n+\t\tif (q->curband)\n+\t\t\tq->curband--;\n+\t\telse\n+\t\t\tq->curband = q->bands - 1;\n \t\treturn NET_XMIT_SUCCESS;\n \t}\n \tif (net_xmit_drop_count(ret))\n","prefixes":[]}