---

yaml --- r: 88013 b: refs/heads/master c: 2ba2506 h: refs/heads/master i: 88011: a5df6fc v: v3
git-mirror · Mar 28, 2008 · 1b22940 · 1b22940
1 parent 051c442
commit 1b22940
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32aced7509cb20ef3ec67c9b56f5b55c41dd4f8d
+refs/heads/master: 2ba2506ca7ca62c56edaa334b0fe61eb5eab6ab0
diff --git a/trunk/net/sched/sch_generic.c b/trunk/net/sched/sch_generic.c
@@ -184,10 +184,22 @@ static inline int qdisc_restart(struct net_device *dev)
 
 void __qdisc_run(struct net_device *dev)
 {
-	do {
-		if (!qdisc_restart(dev))
+	unsigned long start_time = jiffies;
+
+	while (qdisc_restart(dev)) {
+		if (netif_queue_stopped(dev))
+			break;
+
+		/*
+		 * Postpone processing if
+		 * 1. another process needs the CPU;
+		 * 2. we've been doing it for too long.
+		 */
+		if (need_resched() || jiffies != start_time) {
+			netif_schedule(dev);
 			break;
-	} while (!netif_queue_stopped(dev));
+		}
+	}
 
 	clear_bit(__LINK_STATE_QDISC_RUNNING, &dev->state);
 }