]> err.no Git - linux-2.6/commitdiff
pkt_sched: Make netem queue agnostic.
authorDavid S. Miller <davem@davemloft.net>
Wed, 9 Jul 2008 05:57:51 +0000 (22:57 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 9 Jul 2008 05:57:51 +0000 (22:57 -0700)
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>
net/sched/sch_netem.c

index 4093f1eaaf60ea132bceef39be84f1f10979420f..bc585f2089ffaaa4b47d281807bb5422774f8eaa 100644 (file)
@@ -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;