aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/sch_htb.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_htb.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_htb.c')
-rw-r--r--net/sched/sch_htb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 71e4c92b7e87..3f528554b0d4 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -965,7 +965,7 @@ static struct sk_buff *htb_dequeue(struct Qdisc *sch)
965 965
966 if (!sch->q.qlen) 966 if (!sch->q.qlen)
967 goto fin; 967 goto fin;
968 PSCHED_GET_TIME(q->now); 968 q->now = psched_get_time();
969 969
970 next_event = q->now + 5 * PSCHED_TICKS_PER_SEC; 970 next_event = q->now + 5 * PSCHED_TICKS_PER_SEC;
971 q->nwc_hit = 0; 971 q->nwc_hit = 0;
@@ -1274,7 +1274,7 @@ static void htb_parent_to_leaf(struct htb_class *cl, struct Qdisc *new_q)
1274 parent->un.leaf.prio = parent->prio; 1274 parent->un.leaf.prio = parent->prio;
1275 parent->tokens = parent->buffer; 1275 parent->tokens = parent->buffer;
1276 parent->ctokens = parent->cbuffer; 1276 parent->ctokens = parent->cbuffer;
1277 PSCHED_GET_TIME(parent->t_c); 1277 parent->t_c = psched_get_time();
1278 parent->cmode = HTB_CAN_SEND; 1278 parent->cmode = HTB_CAN_SEND;
1279} 1279}
1280 1280
@@ -1471,7 +1471,7 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
1471 cl->tokens = hopt->buffer; 1471 cl->tokens = hopt->buffer;
1472 cl->ctokens = hopt->cbuffer; 1472 cl->ctokens = hopt->cbuffer;
1473 cl->mbuffer = 60 * PSCHED_TICKS_PER_SEC; /* 1min */ 1473 cl->mbuffer = 60 * PSCHED_TICKS_PER_SEC; /* 1min */
1474 PSCHED_GET_TIME(cl->t_c); 1474 cl->t_c = psched_get_time();
1475 cl->cmode = HTB_CAN_SEND; 1475 cl->cmode = HTB_CAN_SEND;
1476 1476
1477 /* attach to the hash list and parent's family */ 1477 /* attach to the hash list and parent's family */