1 files changed, 2 insertions, 8 deletions

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index e244c462e6bd..14cc443d0490 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -480,15 +480,12 @@ static void __qdisc_destroy(struct rcu_head *head)
 
 void qdisc_destroy(struct Qdisc *qdisc)
 {
-        struct net_device *dev = qdisc_dev(qdisc);
-
         if (qdisc->flags & TCQ_F_BUILTIN ||
             !atomic_dec_and_test(&qdisc->refcnt))
                 return;
 
-        spin_lock_bh(&dev->qdisc_list_lock);
-        list_del(&qdisc->list);
-        spin_unlock_bh(&dev->qdisc_list_lock);
+        if (qdisc->parent)
+                list_del(&qdisc->list);
 
         call_rcu(&qdisc->q_rcu, __qdisc_destroy);
 }
@@ -520,9 +517,6 @@ static void attach_one_default_qdisc(struct net_device *dev,
                         printk(KERN_INFO "%s: activation failed\n", dev->name);
                         return;
                 }
-                spin_lock_bh(&dev->qdisc_list_lock);
-                list_add_tail(&qdisc->list, &dev->qdisc_list);
-                spin_unlock_bh(&dev->qdisc_list_lock);
         } else {
                 qdisc =  &noqueue_qdisc;
         }