5 files changed, 14 insertions, 10 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
diff --git a/net/sched/act_police.c b/net/sched/act_police.c
index 0a5679ea6c64..65d60a3f7761 100644
--- a/net/sched/act_police.c
+++ b/net/sched/act_police.c
@@ -298,8 +298,8 @@ static int tcf_act_police(struct sk_buff *skb, struct tc_action *a,
 
                 PSCHED_GET_TIME(now);
 
-                toks = PSCHED_TDIFF_SAFE(now, police->tcfp_t_c,
-                                         police->tcfp_burst);
+                toks = psched_tdiff_bounded(now, police->tcfp_t_c,
+                                            police->tcfp_burst);
                 if (police->tcfp_P_tab) {
                         ptoks = toks + police->tcfp_ptoks;
                         if (ptoks > (long)L2T_P(police, police->tcfp_mtu))
@@ -544,8 +544,8 @@ int tcf_police(struct sk_buff *skb, struct tcf_police *police)
                 }
 
                 PSCHED_GET_TIME(now);
-                toks = PSCHED_TDIFF_SAFE(now, police->tcfp_t_c,
-                                         police->tcfp_burst);
+                toks = psched_tdiff_bounded(now, police->tcfp_t_c,
+                                            police->tcfp_burst);
                 if (police->tcfp_P_tab) {
                         ptoks = toks + police->tcfp_ptoks;
                         if (ptoks > (long)L2T_P(police, police->tcfp_mtu))
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index b7abd0ae676a..71e4c92b7e87 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -729,7 +729,7 @@ static void htb_charge_class(struct htb_sched *q, struct htb_class *cl,
         cl->T = toks
 
         while (cl) {
-                diff = PSCHED_TDIFF_SAFE(q->now, cl->t_c, (u32) cl->mbuffer);
+                diff = psched_tdiff_bounded(q->now, cl->t_c, cl->mbuffer);
                 if (cl->level >= level) {
                         if (cl->level == level)
                                 cl->xstats.lends++;
@@ -789,7 +789,7 @@ static psched_time_t htb_do_events(struct htb_sched *q, int level)
                         return cl->pq_key;
 
                 htb_safe_rb_erase(p, q->wait_pq + level);
-                diff = PSCHED_TDIFF_SAFE(q->now, cl->t_c, (u32) cl->mbuffer);
+                diff = psched_tdiff_bounded(q->now, cl->t_c, cl->mbuffer);
                 htb_change_class_mode(q, cl, &diff);
                 if (cl->cmode != HTB_CAN_SEND)
                         htb_add_to_wait_tree(q, cl, diff);
diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c
index 626ce96800fe..da9f40e54447 100644
--- a/net/sched/sch_tbf.c
+++ b/net/sched/sch_tbf.c
@@ -201,7 +201,7 @@ static struct sk_buff *tbf_dequeue(struct Qdisc* sch)
 
                 PSCHED_GET_TIME(now);
 
-                toks = PSCHED_TDIFF_SAFE(now, q->t_c, q->buffer);
+                toks = psched_tdiff_bounded(now, q->t_c, q->buffer);
 
                 if (q->P_tab) {
                         ptoks = toks + q->ptokens;