aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/sch_api.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/sched/sch_api.c')
-rw-r--r--net/sched/sch_api.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 7d7070b1eebd..d91a2338877c 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -638,11 +638,8 @@ static void notify_and_destroy(struct sk_buff *skb, struct nlmsghdr *n, u32 clid
638 if (new || old) 638 if (new || old)
639 qdisc_notify(skb, n, clid, old, new); 639 qdisc_notify(skb, n, clid, old, new);
640 640
641 if (old) { 641 if (old)
642 sch_tree_lock(old);
643 qdisc_destroy(old); 642 qdisc_destroy(old);
644 sch_tree_unlock(old);
645 }
646} 643}
647 644
648/* Graft qdisc "new" to class "classid" of qdisc "parent" or 645/* Graft qdisc "new" to class "classid" of qdisc "parent" or
@@ -1092,16 +1089,10 @@ create_n_graft:
1092 1089
1093graft: 1090graft:
1094 if (1) { 1091 if (1) {
1095 spinlock_t *root_lock;
1096
1097 err = qdisc_graft(dev, p, skb, n, clid, q, NULL); 1092 err = qdisc_graft(dev, p, skb, n, clid, q, NULL);
1098 if (err) { 1093 if (err) {
1099 if (q) { 1094 if (q)
1100 root_lock = qdisc_root_lock(q);
1101 spin_lock_bh(root_lock);
1102 qdisc_destroy(q); 1095 qdisc_destroy(q);
1103 spin_unlock_bh(root_lock);
1104 }
1105 return err; 1096 return err;
1106 } 1097 }
1107 } 1098 }