From: David S. Miller <davem@davemloft.net>
Date: Thu, 7 Aug 2008 06:35:59 +0000 (-0700)
Subject: pkt_sched: Fix "parent is root" test in qdisc_create().
X-Git-Tag: v2.6.27-rc3~69^2~15
X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ee7af8264dafa0c8c76a8dc596803966c2e29ebc;hp=11d46123bfea068a48483f00518d301f452647fb;p=linux-2.6-omap-h63xx.git

pkt_sched: Fix "parent is root" test in qdisc_create().

As noticed by Stephen Hemminger, the root qdisc is denoted by
TC_H_ROOT, not zero.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 4840aff4725..83b23b55ce3 100644
--- a/net/sched/sch_api.c
+++ b/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;