From: Eric Dumazet <edumazt@google.com>
Date: Tue, 5 Mar 2013 07:15:13 +0000 (+0000)
Subject: net: reduce net_rx_action() latency to 2 HZ
X-Git-Tag: v2.6.32.61~42
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=e072f1c62ab6b74be00105c8db56eff6b760d42e;p=thirdparty%2Fkernel%2Fstable.git

net: reduce net_rx_action() latency to 2 HZ

We should use time_after_eq() to get maximum latency of two ticks,
instead of three.

Bug added in commit 24f8b2385 (net: increase receive packet quantum)

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit d1f41b67ff7735193bc8b418b98ac99a448833e2)
Signed-off-by: Willy Tarreau <w@1wt.eu>
---

diff --git a/net/core/dev.c b/net/core/dev.c
index f4a6e14399638..d77556322046b 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2848,7 +2848,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();