From b5027e0baa35c0da44e0d01edfc81452b13aa836 Mon Sep 17 00:00:00 2001
From: Jarek Poplawski <jarkao2@gmail.com>
Date: Wed, 27 Aug 2008 02:27:10 -0700
Subject: [PATCH] --- yaml --- r: 109236 b: refs/heads/master c:
 fe439dd09d3e4da6a44d35df7371b9c6a2661b99 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/net/sch_generic.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9cab94725416..a91008364a25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6f9b93f1624206c802ac9162c9302edaf59bfd9
+refs/heads/master: fe439dd09d3e4da6a44d35df7371b9c6a2661b99
diff --git a/trunk/include/net/sch_generic.h b/trunk/include/net/sch_generic.h
index ef8a7e2e12e7..e5569625d2a5 100644
--- a/trunk/include/net/sch_generic.h
+++ b/trunk/include/net/sch_generic.h
@@ -232,12 +232,12 @@ static inline struct net_device *qdisc_dev(struct Qdisc *qdisc)
 
 static inline void sch_tree_lock(struct Qdisc *q)
 {
-	spin_lock_bh(qdisc_root_lock(q));
+	spin_lock_bh(qdisc_root_sleeping_lock(q));
 }
 
 static inline void sch_tree_unlock(struct Qdisc *q)
 {
-	spin_unlock_bh(qdisc_root_lock(q));
+	spin_unlock_bh(qdisc_root_sleeping_lock(q));
 }
 
 #define tcf_tree_lock(tp)	sch_tree_lock((tp)->q)