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;