[PATCH 08/10] Multiply perturb_period by HZ when used rather than when assigned.

[Corey Hickey]

perturb_period is the only parameter that doesn't match 1:1 with the
value from userspace. This change makes it easy and clean to use a
small macro for setting parameters (in a subsequent patch).

Signed-off-by: Corey Hickey <[EMAIL PROTECTED]>
---
 net/sched/sch_sfq.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index 341a9a1..2d3cc38 100644
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -370,7 +370,7 @@ static void sfq_perturbation(unsigned long arg)
        q->perturbation = net_random()&0x1F;
 
        if (q->perturb_period) {
-               q->perturb_timer.expires = jiffies + q->perturb_period;
+               q->perturb_timer.expires = jiffies + q->perturb_period * HZ;
                add_timer(&q->perturb_timer);
        }
 }
@@ -433,7 +433,7 @@ sfq_q_init(struct sfq_sched_data *q, struct rtattr *opt)
                if (ctl->quantum)
                        q->quantum = ctl->quantum;
                if (ctl->perturb_period)
-                       q->perturb_period = ctl->perturb_period * HZ;
+                       q->perturb_period = ctl->perturb_period;
                if (ctl->divisor)
                        q->hash_divisor = ctl->divisor;
                if (ctl->flows)
@@ -496,7 +496,7 @@ static int sfq_init(struct Qdisc *sch, struct rtattr *opt)
        q->perturb_timer.data = (unsigned long)sch;
        q->perturb_timer.function = sfq_perturbation;
        if (q->perturb_period) {
-               q->perturb_timer.expires = jiffies + q->perturb_period;
+               q->perturb_timer.expires = jiffies + q->perturb_period * HZ;
                add_timer(&q->perturb_timer);
        }
 
@@ -542,7 +542,7 @@ static int sfq_change(struct Qdisc *sch, struct rtattr *opt)
 
        /* finish up */
        if (q->perturb_period) {
-               q->perturb_timer.expires = jiffies + q->perturb_period;
+               q->perturb_timer.expires = jiffies + q->perturb_period * HZ;
                add_timer(&q->perturb_timer);
        } else {
                q->perturbation = 0;
@@ -558,7 +558,7 @@ static int sfq_dump(struct Qdisc *sch, struct sk_buff *skb)
        struct tc_sfq_qopt opt;
 
        opt.quantum = q->quantum;
-       opt.perturb_period = q->perturb_period/HZ;
+       opt.perturb_period = q->perturb_period;
 
        opt.limit = q->limit;
        opt.divisor = q->hash_divisor;
-- 
1.5.3

-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html