From 8bfd38c7ee2fa9deddf321e191bc47493b2ef080 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Wed, 6 Aug 2008 23:35:59 -0700 Subject: [PATCH] --- yaml --- r: 107951 b: refs/heads/master c: ee7af8264dafa0c8c76a8dc596803966c2e29ebc h: refs/heads/master i: 107949: 3d73c4c269ff18432a86fa07233b2af346da97d8 107947: f4d556b852499f589d05773858d39632da6ad22c 107943: 51ca465a50cd3773cc7e894132797ffda128c3f7 107935: 3be00e78a605c8271a11b5ecc6246b69621299a9 v: v3 --- [refs] | 2 +- trunk/net/sched/sch_api.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2a683bbdc745..99cef3bc9d34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11d46123bfea068a48483f00518d301f452647fb +refs/heads/master: ee7af8264dafa0c8c76a8dc596803966c2e29ebc diff --git a/trunk/net/sched/sch_api.c b/trunk/net/sched/sch_api.c index 4840aff47256..83b23b55ce36 100644 --- a/trunk/net/sched/sch_api.c +++ b/trunk/net/sched/sch_api.c @@ -792,7 +792,7 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue, goto err_out3; } } - if (parent && !(sch->flags & TCQ_F_INGRESS)) + if ((parent != TC_H_ROOT) && !(sch->flags & TCQ_F_INGRESS)) list_add_tail(&sch->list, &dev_queue->qdisc->list); return sch;