[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>

3 files changed, 7 insertions, 7 deletions

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;