diff options
author | Jarek Poplawski <jarkao2@gmail.com> | 2008-08-27 05:27:10 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-08-27 05:27:10 -0400 |
commit | fe439dd09d3e4da6a44d35df7371b9c6a2661b99 (patch) | |
tree | e37911e7a8535f662beec78cbb41a9afc1c070f7 /include/net/sch_generic.h | |
parent | f6f9b93f1624206c802ac9162c9302edaf59bfd9 (diff) |
pkt_sched: Fix sch_tree_lock()
Use new qdisc_root_sleeping_lock() instead of qdisc_root_lock() as
sch_tree_lock() because this lock could be used while dev is
deactivated, but we never need to use this with noop_qdisc as a root.
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/sch_generic.h')
-rw-r--r-- | include/net/sch_generic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index ef8a7e2e12e7..e5569625d2a5 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h | |||
@@ -232,12 +232,12 @@ static inline struct net_device *qdisc_dev(struct Qdisc *qdisc) | |||
232 | 232 | ||
233 | static inline void sch_tree_lock(struct Qdisc *q) | 233 | static inline void sch_tree_lock(struct Qdisc *q) |
234 | { | 234 | { |
235 | spin_lock_bh(qdisc_root_lock(q)); | 235 | spin_lock_bh(qdisc_root_sleeping_lock(q)); |
236 | } | 236 | } |
237 | 237 | ||
238 | static inline void sch_tree_unlock(struct Qdisc *q) | 238 | static inline void sch_tree_unlock(struct Qdisc *q) |
239 | { | 239 | { |
240 | spin_unlock_bh(qdisc_root_lock(q)); | 240 | spin_unlock_bh(qdisc_root_sleeping_lock(q)); |
241 | } | 241 | } |
242 | 242 | ||
243 | #define tcf_tree_lock(tp) sch_tree_lock((tp)->q) | 243 | #define tcf_tree_lock(tp) sch_tree_lock((tp)->q) |