From: Thomas Graf <tgraf@suug.ch>
Date: Sat, 5 Nov 2005 20:14:26 +0000 (+0100)
Subject: [PKT_SCHED]: GRED: Fix restart of idle period in WRED mode upon dequeue and drop
X-Git-Tag: v2.6.15-rc1~452^2^2~2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8f64e19605d6ce40bc560e7bc919e2e02a79c1b;p=linux-2.6

[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 1fb34be32f..69f0fd45d4 100644
--- 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;