diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-19 08:00:11 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-19 08:00:11 +0200 |
| commit | 30ee42be00b7a50929a73cb617f70b1d3219eb69 (patch) | |
| tree | d2da673ab69eb897dd558be4df90a938f15afba8 | |
| parent | pkt_sched: Manage qdisc list inside of root qdisc. (diff) | |
| download | linux-30ee42be00b7a50929a73cb617f70b1d3219eb69.tar.xz linux-30ee42be00b7a50929a73cb617f70b1d3219eb69.zip | |
pkt_sched: Fix noqueue_qdisc initialization.
Like noop_qdisc, it needs a dummy backpointer and
explicit qdisc->q.lock initialization.
Based upon a report by Stephen Hemminger.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/sched/sch_generic.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 14cc443d0490..522a41a9f904 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -340,12 +340,19 @@ static struct Qdisc_ops noqueue_qdisc_ops __read_mostly = { .owner = THIS_MODULE, }; +static struct Qdisc noqueue_qdisc; +static struct netdev_queue noqueue_netdev_queue = { + .qdisc = &noqueue_qdisc, +}; + static struct Qdisc noqueue_qdisc = { .enqueue = NULL, .dequeue = noop_dequeue, .flags = TCQ_F_BUILTIN, .ops = &noqueue_qdisc_ops, .list = LIST_HEAD_INIT(noqueue_qdisc.list), + .q.lock = __SPIN_LOCK_UNLOCKED(noqueue_qdisc.q.lock), + .dev_queue = &noqueue_netdev_queue, }; |