summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller2008-08-07 08:35:59 +0200
committerDavid S. Miller2008-08-07 08:35:59 +0200
commitee7af8264dafa0c8c76a8dc596803966c2e29ebc (patch)
tree2dfd9066bcf677ec4b1e7becb39d6f8187961385
parentipv4: Fix over-ifdeffing of ip_static_sysctl_init. (diff)
downloadkernel-qcow2-linux-ee7af8264dafa0c8c76a8dc596803966c2e29ebc.tar.gz
kernel-qcow2-linux-ee7af8264dafa0c8c76a8dc596803966c2e29ebc.tar.xz
kernel-qcow2-linux-ee7af8264dafa0c8c76a8dc596803966c2e29ebc.zip
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>
-rw-r--r--net/sched/sch_api.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 4840aff47256..83b23b55ce36 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;