[IPV4]: Consolidate fib_select_default.

[linux-2.6-omap-h63xx.git] / include / net / pkt_sched.h

diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index 32cdf0137cb2ce9a2174cc95f092e8adcf44c229..ab61809a9616af402d8d197da3fc58a89b05e69c 100644 (file)
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -13,8 +13,6 @@ struct qdisc_walker
        int     (*fn)(struct Qdisc *, unsigned long cl, struct qdisc_walker *);
 };
 
-extern rwlock_t qdisc_tree_lock;
-
 #define QDISC_ALIGNTO          32
 #define QDISC_ALIGN(len)       (((len) + QDISC_ALIGNTO-1) & ~(QDISC_ALIGNTO-1))
 
@@ -48,15 +46,18 @@ typedef long        psched_tdiff_t;
 #define PSCHED_NS2US(x)                        ((x) >> 10)
 
 #define PSCHED_TICKS_PER_SEC           PSCHED_NS2US(NSEC_PER_SEC)
-#define PSCHED_GET_TIME(stamp) \
-       ((stamp) = PSCHED_NS2US(ktime_to_ns(ktime_get())))
+#define PSCHED_PASTPERFECT             0
+
+static inline psched_time_t psched_get_time(void)
+{
+       return PSCHED_NS2US(ktime_to_ns(ktime_get()));
+}
 
-#define PSCHED_TDIFF(tv1, tv2)         (long)((tv1) - (tv2))
-#define PSCHED_TDIFF_SAFE(tv1, tv2, bound) \
-                                       min_t(long long, (tv1) - (tv2), bound)
-#define PSCHED_TLESS(tv1, tv2)         ((tv1) < (tv2))
-#define PSCHED_SET_PASTPERFECT(t)      ((t) = 0)
-#define PSCHED_IS_PASTPERFECT(t)       ((t) == 0)
+static inline psched_tdiff_t
+psched_tdiff_bounded(psched_time_t tv1, psched_time_t tv2, psched_time_t bound)
+{
+       return min(tv1 - tv2, bound);
+}
 
 struct qdisc_watchdog {
        struct hrtimer  timer;
@@ -88,16 +89,17 @@ static inline void qdisc_run(struct net_device *dev)
                __qdisc_run(dev);
 }
 
+extern int tc_classify_compat(struct sk_buff *skb, struct tcf_proto *tp,
+                             struct tcf_result *res);
 extern int tc_classify(struct sk_buff *skb, struct tcf_proto *tp,
-       struct tcf_result *res);
+                      struct tcf_result *res);
 
 /* Calculate maximal size of packet seen by hard_start_xmit
    routine of this device.
  */
-static inline unsigned psched_mtu(struct net_device *dev)
+static inline unsigned psched_mtu(const struct net_device *dev)
 {
-       unsigned mtu = dev->mtu;
-       return dev->hard_header ? mtu + dev->hard_header_len : mtu;
+       return dev->mtu + dev->hard_header_len;
 }
 
 #endif