Commit:     d3e994830d35159320d0a98c36aa580410c29609
Parent:     51314a17baabc710e5fb12975fe8983dedd5ac0d
Author:     Stephen Hemminger <[EMAIL PROTECTED]>
AuthorDate: Sun Jan 20 17:18:45 2008 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 15:08:15 2008 -0800

    [PKT_SCHED] SFQ: timer is deferrable
    The perturbation timer used for re-keying can be deferred, it doesn't
    need to be deterministic.
    Signed-off-by: Stephen Hemminger <[EMAIL PROTECTED]>
    Acked-by: Paul E. McKenney <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
 net/sched/sch_sfq.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index c58fa6e..ba3a85e 100644
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -426,7 +426,9 @@ static int sfq_init(struct Qdisc *sch, struct rtattr *opt)
        struct sfq_sched_data *q = qdisc_priv(sch);
        int i;
-       setup_timer(&q->perturb_timer, sfq_perturbation, (unsigned long)sch);
+       q->perturb_timer.function = sfq_perturbation;
+       q-> = (unsigned long)sch;;
+       init_timer_deferrable(&q->perturb_timer);
        for (i=0; i<SFQ_HASH_DIVISOR; i++)
                q->ht[i] = SFQ_DEPTH;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to