aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/sch_hfsc.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2007-03-23 14:29:25 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:27:55 -0400
commit3bebcda28077375470dd60545b71bba2f83335fd (patch)
treea0d610788ccfe8d3b50d6ebf3df014e98f6387bc /net/sched/sch_hfsc.c
parent03cc45c0a5b9b7f74768feb43b9a2525d203bbdb (diff)
[NET_SCHED]: turn PSCHED_GET_TIME into inline function
Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_hfsc.c')
-rw-r--r--net/sched/sch_hfsc.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c
index 6a762cf781d7..7d51d0d6a70e 100644
--- a/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c
@@ -629,9 +629,7 @@ rtsc_min(struct runtime_sc *rtsc, struct internal_sc *isc, u64 x, u64 y)
629static void 629static void
630init_ed(struct hfsc_class *cl, unsigned int next_len) 630init_ed(struct hfsc_class *cl, unsigned int next_len)
631{ 631{
632 u64 cur_time; 632 u64 cur_time = psched_get_time();
633
634 PSCHED_GET_TIME(cur_time);
635 633
636 /* update the deadline curve */ 634 /* update the deadline curve */
637 rtsc_min(&cl->cl_deadline, &cl->cl_rsc, cur_time, cl->cl_cumul); 635 rtsc_min(&cl->cl_deadline, &cl->cl_rsc, cur_time, cl->cl_cumul);
@@ -754,7 +752,7 @@ init_vf(struct hfsc_class *cl, unsigned int len)
754 if (cl->cl_flags & HFSC_USC) { 752 if (cl->cl_flags & HFSC_USC) {
755 /* class has upper limit curve */ 753 /* class has upper limit curve */
756 if (cur_time == 0) 754 if (cur_time == 0)
757 PSCHED_GET_TIME(cur_time); 755 cur_time = psched_get_time();
758 756
759 /* update the ulimit curve */ 757 /* update the ulimit curve */
760 rtsc_min(&cl->cl_ulimit, &cl->cl_usc, cur_time, 758 rtsc_min(&cl->cl_ulimit, &cl->cl_usc, cur_time,
@@ -1038,7 +1036,7 @@ hfsc_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
1038 if (cl->cl_parent == NULL && parentid != TC_H_ROOT) 1036 if (cl->cl_parent == NULL && parentid != TC_H_ROOT)
1039 return -EINVAL; 1037 return -EINVAL;
1040 } 1038 }
1041 PSCHED_GET_TIME(cur_time); 1039 cur_time = psched_get_time();
1042 1040
1043 sch_tree_lock(sch); 1041 sch_tree_lock(sch);
1044 if (rsc != NULL) 1042 if (rsc != NULL)
@@ -1639,7 +1637,7 @@ hfsc_dequeue(struct Qdisc *sch)
1639 if ((skb = __skb_dequeue(&q->requeue))) 1637 if ((skb = __skb_dequeue(&q->requeue)))
1640 goto out; 1638 goto out;
1641 1639
1642 PSCHED_GET_TIME(cur_time); 1640 cur_time = psched_get_time();
1643 1641
1644 /* 1642 /*
1645 * if there are eligible classes, use real-time criteria. 1643 * if there are eligible classes, use real-time criteria.