From f8008ac26998d595892805d82817f5cfde823c96 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 8 Jul 2008 22:57:51 -0700
Subject: [PATCH] --- yaml --- r: 103391 b: refs/heads/master c:
 74d58a0c1d5b348a8d4ea9643b573a6ab455a3f3 h: refs/heads/master i:   103389:
 eea685f02ee20c4849c5129833d05d10fdd6e39f   103387:
 325ccd5e669f0ef9263a9ac8ba54db4d680e20b6   103383:
 7241019944d838831b5e1fe733291033b06c04d2   103375:
 bf860fd3a40be9e96961841d5aae6cb0cd5848fb   103359:
 942a4f6e6c92c83b0b7ac3efe33f2f0058989b7e v: v3

---
 [refs]                      | 2 +-
 trunk/net/sched/sch_netem.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 76adca1fcc1e..57c2a1761912 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68dfb42798e1eb2d42acbf872925cc75f1487d9b
+refs/heads/master: 74d58a0c1d5b348a8d4ea9643b573a6ab455a3f3
diff --git a/trunk/net/sched/sch_netem.c b/trunk/net/sched/sch_netem.c
index 4093f1eaaf60..bc585f2089ff 100644
--- a/trunk/net/sched/sch_netem.c
+++ b/trunk/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;