---

yaml --- r: 361052 b: refs/heads/master c: d1f41b6 h: refs/heads/master v: v3
git-mirror · Mar 6, 2013 · 7f96f10 · 7f96f10
1 parent 6e00a12
commit 7f96f10
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 691b3b7e1329141acf1e5ed44d8b468cea065fe3
+refs/heads/master: d1f41b67ff7735193bc8b418b98ac99a448833e2
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -4103,7 +4103,7 @@ static void net_rx_action(struct softirq_action *h)
 		 * Allow this to run for 2 jiffies since which will allow
 		 * an average latency of 1.5/HZ.
 		 */
-		if (unlikely(budget <= 0 || time_after(jiffies, time_limit)))
+		if (unlikely(budget <= 0 || time_after_eq(jiffies, time_limit)))
 			goto softnet_break;
 
 		local_irq_enable();