pkt_sched: Get rid of u32_list.

[safe/jmp/linux-2.6] / include / net / sch_generic.h

diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index b47f556..8a44386 100644 (file)
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -23,6 +23,12 @@ struct qdisc_rate_table
        int             refcnt;
 };
 
+enum qdisc_state_t
+{
+       __QDISC_STATE_RUNNING,
+       __QDISC_STATE_SCHED,
+};
+
 struct Qdisc
 {
        int                     (*enqueue)(struct sk_buff *skb, struct Qdisc *dev);
@@ -36,8 +42,11 @@ struct Qdisc
        u32                     handle;
        u32                     parent;
        atomic_t                refcnt;
+       unsigned long           state;
+       struct sk_buff          *gso_skb;
        struct sk_buff_head     q;
        struct netdev_queue     *dev_queue;
+       struct Qdisc            *next_sched;
        struct list_head        list;
 
        struct gnet_stats_basic bstats;
@@ -47,6 +56,8 @@ struct Qdisc
        int                     (*reshape_fail)(struct sk_buff *skb,
                                        struct Qdisc *q);
 
+       void                    *u32_node;
+
        /* This field is deprecated, but it is still used by CBQ
         * and it will live until better solution will be invented.
         */
@@ -154,18 +165,40 @@ struct tcf_proto
        struct tcf_proto_ops    *ops;
 };
 
+static inline spinlock_t *qdisc_lock(struct Qdisc *qdisc)
+{
+       return &qdisc->q.lock;
+}
+
+static inline struct Qdisc *qdisc_root(struct Qdisc *qdisc)
+{
+       return qdisc->dev_queue->qdisc;
+}
+
+static inline spinlock_t *qdisc_root_lock(struct Qdisc *qdisc)
+{
+       struct Qdisc *root = qdisc_root(qdisc);
+
+       return qdisc_lock(root);
+}
+
 static inline struct net_device *qdisc_dev(struct Qdisc *qdisc)
 {
        return qdisc->dev_queue->dev;
 }
 
-extern void qdisc_lock_tree(struct net_device *dev);
-extern void qdisc_unlock_tree(struct net_device *dev);
+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 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))
+#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;
@@ -343,7 +376,7 @@ static inline void __qdisc_reset_queue(struct Qdisc *sch,
         * We do not know the backlog in bytes of this list, it
         * is up to the caller to correct it
         */
-       skb_queue_purge(list);
+       __skb_queue_purge(list);
 }
 
 static inline void qdisc_reset_queue(struct Qdisc *sch)