[PKT_SCHED]: GRED: Fix restart of idle period in WRED mode upon dequeue and drop

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>

diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c
index 1fb34be32f7c499e51e275cbc450cb5d356cefcc..69f0fd45d4c3bf8e215262a6174c5f06fa8d235a 100644 (file)
--- a/net/sched/sch_gred.c
+++ b/net/sched/sch_gred.c
@@ -267,7 +267,7 @@ static struct sk_buff *gred_dequeue(struct Qdisc* sch)
                return skb;
        }
 
-       if (gred_wred_mode(t))
+       if (gred_wred_mode(t) && !red_is_idling(&t->wred_set))
                red_start_of_idle_period(&t->wred_set);
 
        return NULL;
@@ -301,7 +301,7 @@ static unsigned int gred_drop(struct Qdisc* sch)
                return len;
        }
 
-       if (gred_wred_mode(t))
+       if (gred_wred_mode(t) && !red_is_idling(&t->wred_set))
                red_start_of_idle_period(&t->wred_set);
 
        return 0;