aboutsummaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-16 03:12:24 -0700
committerDavid S. Miller <davem@davemloft.net>2008-07-17 19:21:28 -0700
commit78a5b30b7324b2d66bcf7d2e3935877d3c26497c (patch)
treea281f8611679c93c39cf6e9ff1e5b4121cbb8011 /include/net
parent53049978df1d9ae55bf397c9879e6b33218352db (diff)
pkt_sched: Rework {sch,tbf}_tree_lock().
Make sch_tree_lock() lock the qdisc's root. All of the users hold the RTNL semaphore and the root qdisc is not changing. Implement tbf_tree_{lock,unlock}() simply in terms of sch_tree_{lock,unlock}(). Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/sch_generic.h16
1 files changed, 12 insertions, 4 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 3cc4b5cd8c6..60e1e9f9e45 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -183,10 +183,18 @@ static inline struct net_device *qdisc_dev(struct Qdisc *qdisc)
extern void qdisc_lock_tree(struct net_device *dev);
extern void qdisc_unlock_tree(struct net_device *dev);
-#define sch_tree_lock(q) qdisc_lock_tree(qdisc_dev(q))
-#define sch_tree_unlock(q) qdisc_unlock_tree(qdisc_dev(q))
-#define tcf_tree_lock(tp) qdisc_lock_tree(qdisc_dev((tp)->q))
-#define tcf_tree_unlock(tp) qdisc_unlock_tree(qdisc_dev((tp)->q))
+static inline void sch_tree_lock(struct Qdisc *q)
+{
+ spin_lock_bh(qdisc_root_lock(q));
+}
+
+static inline void sch_tree_unlock(struct Qdisc *q)
+{
+ spin_unlock_bh(qdisc_root_lock(q));
+}
+
+#define tcf_tree_lock(tp) sch_tree_lock((tp)->q)
+#define tcf_tree_unlock(tp) sch_tree_unlock((tp)->q)
extern struct Qdisc noop_qdisc;
extern struct Qdisc_ops noop_qdisc_ops;