Skip to content

Commit

Permalink
pkt_sched: Use per-queue locking in shutdown_scheduler_queue.
Browse files Browse the repository at this point in the history
This eliminates another qdisc_lock_tree user.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Jul 18, 2008
1 parent 8a34c5d commit 17715e6
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions net/sched/sch_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -757,18 +757,20 @@ static void shutdown_scheduler_queue(struct net_device *dev,
struct Qdisc *qdisc_default = _qdisc_default;

if (qdisc) {
spinlock_t *root_lock = qdisc_root_lock(qdisc);

dev_queue->qdisc = qdisc_default;
dev_queue->qdisc_sleeping = qdisc_default;

spin_lock(root_lock);
qdisc_destroy(qdisc);
spin_unlock(root_lock);
}
}

void dev_shutdown(struct net_device *dev)
{
qdisc_lock_tree(dev);
netdev_for_each_tx_queue(dev, shutdown_scheduler_queue, &noop_qdisc);
shutdown_scheduler_queue(dev, &dev->rx_queue, NULL);
BUG_TRAP(!timer_pending(&dev->watchdog_timer));
qdisc_unlock_tree(dev);
}

0 comments on commit 17715e6

Please sign in to comment.