From bc5c7a21de377b44d4c85ed536167e5868b03939 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Wed, 16 Jul 2008 02:23:17 -0700 Subject: [PATCH] --- yaml --- r: 103600 b: refs/heads/master c: 16361127ebed0fb8f9d7cc94c6e137eaf710f676 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/sched/sch_generic.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7cdaf8470a88..f07abeb3d8da 100644 --- 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 index dd5c4e70abe4..7e078c593194 100644 --- 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); }