From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 23 May 2007 21:30:44 +0000 (-0700)
Subject: [NET_SCHED]: Fix qdisc_restart return value when dequeue is empty
X-Git-Tag: v2.6.22-rc3~9^2~23
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=36247f5421015eab0bdd96789b24790598934db9;p=linux-2.6-omap-h63xx.git

[NET_SCHED]: Fix qdisc_restart return value when dequeue is empty

My previous patch that changed the return value of qdisc_restart
incorrectly made the case where dequeue returns empty continue
processing packets.

This patch is based on diagnosis and fix by Patrick McHardy.

Reported-and-debugged-by: Anant Nitya <kernel@prachanda.info>

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index f28bb2dc58d..cbefe225581 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -169,8 +169,8 @@ requeue:
 		else
 			q->ops->requeue(skb, q);
 		netif_schedule(dev);
-		return 0;
 	}
+	return 0;
 
 out:
 	BUG_ON((int) q->q.qlen < 0);