Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / net / sched / sch_gred.c

diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c
index f8a0800..1861ab1 100644 (file)
--- a/net/sched/sch_gred.c
+++ b/net/sched/sch_gred.c
@@ -155,7 +155,7 @@ gred_enqueue(struct sk_buff *skb, struct Qdisc* sch)
        if (!PSCHED_IS_PASTPERFECT(q->qidlestart)) {
                long us_idle;
                PSCHED_GET_TIME(now);
-               us_idle = PSCHED_TDIFF_SAFE(now, q->qidlestart, q->Scell_max, 0);
+               us_idle = PSCHED_TDIFF_SAFE(now, q->qidlestart, q->Scell_max);
                PSCHED_SET_PASTPERFECT(q->qidlestart);
 
                q->qave >>= q->Stab[(us_idle>>q->Scell_log)&0xFF];
@@ -551,7 +551,7 @@ static int gred_dump(struct Qdisc *sch, struct sk_buff *skb)
                                long idle;
                                psched_time_t now;
                                PSCHED_GET_TIME(now);
-                               idle = PSCHED_TDIFF_SAFE(now, q->qidlestart, q->Scell_max, 0);
+                               idle = PSCHED_TDIFF_SAFE(now, q->qidlestart, q->Scell_max);
                                qave  = q->qave >> q->Stab[(idle>>q->Scell_log)&0xFF];
                                dst->qave = qave >> q->Wlog;