commit 03cc45c0a5b9b7f74768feb43b9a2525d203bbdb
author Patrick McHardy <kaber@trash.net> Fri Mar 23 11:29:11 2007 -0700
committer David S. Miller <davem@sunset.davemloft.net> Wed Apr 25 22:27:54 2007 -0700
tree acb5b1d692c9fdf526863f641547744b0a2d38a0
parent 8edc0c31d6b7849b0fb50db86824830769241939

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

net/sched/sch_htb.c

diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index b7abd0a..71e4c92 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -729,7 +729,7 @@
 	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 @@
 			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);