diff --git a/[refs] b/[refs] index 4384828350e7..fc9a24fcb0dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4335cd2da1e8986fa8aff21a91144d986cb0a5fc +refs/heads/master: 3a76e3716b4e571f5d91a20b6afb412560599083 diff --git a/trunk/net/sched/sch_api.c b/trunk/net/sched/sch_api.c index c25465e5607a..c8dc72e12107 100644 --- a/trunk/net/sched/sch_api.c +++ b/trunk/net/sched/sch_api.c @@ -638,9 +638,9 @@ static void notify_and_destroy(struct sk_buff *skb, struct nlmsghdr *n, u32 clid qdisc_notify(skb, n, clid, old, new); if (old) { - spin_lock_bh(&old->q.lock); + sch_tree_lock(old); qdisc_destroy(old); - spin_unlock_bh(&old->q.lock); + sch_tree_unlock(old); } }