---

yaml --- r: 103391 b: refs/heads/master c: 74d58a0 h: refs/heads/master i: 103389: eea685f 103387: 325ccd5 103383: 7241019 103375: bf860fd 103359: 942a4f6 v: v3
git-mirror · Jul 9, 2008 · f8008ac · f8008ac
1 parent d0c86e6
commit f8008ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;