summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-09 07:57:51 +0200
committerDavid S. Miller <davem@davemloft.net>2008-07-09 07:57:51 +0200
commit74d58a0c1d5b348a8d4ea9643b573a6ab455a3f3 (patch)
tree2dc8f989cd75529c037e712ea85e7148c1150c86 /net
parentpkt_sched: Kill stats_lock member of struct Qdisc. (diff)
downloadlinux-74d58a0c1d5b348a8d4ea9643b573a6ab455a3f3.tar.xz
linux-74d58a0c1d5b348a8d4ea9643b573a6ab455a3f3.zip
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>
Diffstat (limited to 'net')
-rw-r--r--net/sched/sch_netem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index 4093f1eaaf60..bc585f2089ff 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;