diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:05:45 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:05:45 -0400 |
| commit | 3ce9bcb583536c45a46c7302747029450e22279c (patch) | |
| tree | 7a4167189ffc6dc909151d1a5d040f9f0656a9f4 /net/sched/sch_teql.c | |
| parent | 26fd10517e810dd59ea050b052de24a75ee6dc07 (diff) | |
| parent | f7d0b926ac8c8ec0c7a83ee69409bd2e6bb39f81 (diff) | |
Merge branch 'core/xen' into x86/xen
Diffstat (limited to 'net/sched/sch_teql.c')
| -rw-r--r-- | net/sched/sch_teql.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c index 2c35c678563b..d35ef059abb1 100644 --- a/net/sched/sch_teql.c +++ b/net/sched/sch_teql.c | |||
| @@ -161,7 +161,7 @@ teql_destroy(struct Qdisc* sch) | |||
| 161 | txq = netdev_get_tx_queue(master->dev, 0); | 161 | txq = netdev_get_tx_queue(master->dev, 0); |
| 162 | master->slaves = NULL; | 162 | master->slaves = NULL; |
| 163 | 163 | ||
| 164 | root_lock = qdisc_root_lock(txq->qdisc); | 164 | root_lock = qdisc_root_sleeping_lock(txq->qdisc); |
| 165 | spin_lock_bh(root_lock); | 165 | spin_lock_bh(root_lock); |
| 166 | qdisc_reset(txq->qdisc); | 166 | qdisc_reset(txq->qdisc); |
| 167 | spin_unlock_bh(root_lock); | 167 | spin_unlock_bh(root_lock); |