From: Jarek Poplawski <jarkao2@gmail.com>
Date: Tue, 15 Sep 2009 09:53:07 +0000 (-0700)
Subject: pkt_sched: Fix tx queue selection in tc_modify_qdisc
X-Git-Tag: v2.6.32-rc1~657^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=926e61b7c44db83013159ac2f74bccd451607b5a;p=pandora-kernel.git

pkt_sched: Fix tx queue selection in tc_modify_qdisc

After the recent mq change there is the new select_queue qdisc class
method used in tc_modify_qdisc, but it works OK only for direct child
qdiscs of mq qdisc. Grandchildren always get the first tx queue, which
would give wrong qdisc_root etc. results (e.g. for sch_htb as child of
sch_prio). This patch fixes it by using parent's dev_queue for such
grandchildren qdiscs. The select_queue method's return type is changed
BTW.

With feedback from: Patrick McHardy <kaber@trash.net>

Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed