From: David S. Miller <davem@davemloft.net>
Date: Wed, 9 Jul 2008 05:57:51 +0000 (-0700)
Subject: pkt_sched: Make netem queue agnostic.
X-Git-Tag: v2.6.27-rc1~969^2~176
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=74d58a0c1d5b348a8d4ea9643b573a6ab455a3f3;p=linux-2.6-omap-h63xx.git

pkt_sched: Make netem queue agnostic.

It just wants the root qdisc given an arbitrary qdisc,
and that is simply qdisc->dev_queue->qdisc

Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
---

diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index 4093f1eaaf6..bc585f2089f 100644
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -180,7 +180,7 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 	 * skb will be queued.
 	 */
 	if (count > 1 && (skb2 = skb_clone(skb, GFP_ATOMIC)) != NULL) {
-		struct Qdisc *rootq = qdisc_dev(sch)->tx_queue.qdisc;
+		struct Qdisc *rootq = sch->dev_queue->qdisc;
 		u32 dupsave = q->duplicate; /* prevent duplicating a dup... */
 		q->duplicate = 0;