aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched
diff options
context:
space:
mode:
authorJarek Poplawski <jarkao2@gmail.com>2008-08-18 01:02:11 -0400
committerDavid S. Miller <davem@davemloft.net>2008-08-18 01:02:11 -0400
commit3a76e3716b4e571f5d91a20b6afb412560599083 (patch)
treecaf2e5e493774bef0bcf82eb489c00b68a0144bf /net/sched
parent4335cd2da1e8986fa8aff21a91144d986cb0a5fc (diff)
pkt_sched: Grab correct lock in notify_and_destroy().
From: Jarek Poplawski <jarkao2@gmail.com> When we are destroying non-root qdiscs, we need to lock the root of the qdisc tree not the the qdisc itself. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
-rw-r--r--net/sched/sch_api.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index c25465e5607a..c8dc72e12107 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -638,9 +638,9 @@ static void notify_and_destroy(struct sk_buff *skb, struct nlmsghdr *n, u32 clid
638 qdisc_notify(skb, n, clid, old, new); 638 qdisc_notify(skb, n, clid, old, new);
639 639
640 if (old) { 640 if (old) {
641 spin_lock_bh(&old->q.lock); 641 sch_tree_lock(old);
642 qdisc_destroy(old); 642 qdisc_destroy(old);
643 spin_unlock_bh(&old->q.lock); 643 sch_tree_unlock(old);
644 } 644 }
645} 645}
646 646