[NET_SCHED]: turn PSCHED_TDIFF_SAFE into inline function

Also rename to psched_tdiff_bounded.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 7 insertions, 3 deletions

diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index 163973740207..e6b1da050d32 100644
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -51,10 +51,14 @@ typedef long	psched_tdiff_t;
 #define PSCHED_GET_TIME(stamp) \
         ((stamp) = PSCHED_NS2US(ktime_to_ns(ktime_get())))
 
-#define PSCHED_TDIFF_SAFE(tv1, tv2, bound) \
-                                        min_t(long long, (tv1) - (tv2), bound)
 #define PSCHED_PASTPERFECT              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;
         struct Qdisc    *qdisc;
diff --git a/include/net/red.h b/include/net/red.h
index d9e1149a2bca..0bc16913fdd7 100644
--- a/include/net/red.h
+++ b/include/net/red.h
@@ -178,7 +178,7 @@ static inline unsigned long red_calc_qavg_from_idle_time(struct red_parms *p)
         int  shift;
 
         PSCHED_GET_TIME(now);
-        us_idle = PSCHED_TDIFF_SAFE(now, p->qidlestart, p->Scell_max);
+        us_idle = psched_tdiff_bounded(now, p->qidlestart, p->Scell_max);
 
         /*
          * The problem: ideally, average length queue recalcultion should