---

yaml --- r: 103600 b: refs/heads/master c: 1636112 h: refs/heads/master v: v3
git-mirror · Jul 18, 2008 · bc5c7a2 · bc5c7a2
1 parent 2d2c648
commit bc5c7a2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37437bb2e1ae8af470dfcd5b4ff454110894ccaf
+refs/heads/master: 16361127ebed0fb8f9d7cc94c6e137eaf710f676
diff --git a/trunk/net/sched/sch_generic.c b/trunk/net/sched/sch_generic.c
@@ -741,10 +741,8 @@ static void dev_init_scheduler_queue(struct net_device *dev,
 
 void dev_init_scheduler(struct net_device *dev)
 {
-	qdisc_lock_tree(dev);
 	netdev_for_each_tx_queue(dev, dev_init_scheduler_queue, &noop_qdisc);
 	dev_init_scheduler_queue(dev, &dev->rx_queue, NULL);
-	qdisc_unlock_tree(dev);
 
 	setup_timer(&dev->watchdog_timer, dev_watchdog, (unsigned long)dev);
 }