From: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Date: Sat, 1 Dec 2007 22:48:04 +0000 (+0200)
Subject: [TCP]: Add unlikely() to urgent handling in clean_rtx_queue
X-Git-Tag: v2.6.25-rc1~1162^2~1278
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea60658cde9f4df7d05b95c81a72a95ad07f0701;p=linux-2.6

[TCP]: Add unlikely() to urgent handling in clean_rtx_queue

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 6bc594a63c..8e4d74ee31 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -2825,8 +2825,8 @@ static int tcp_clean_rtx_queue(struct sock *sk, s32 *seq_rtt_p,
 		if (sacked & TCPCB_LOST)
 			tp->lost_out -= packets_acked;
 
-		if ((sacked & TCPCB_URG) && tp->urg_mode &&
-		    !before(end_seq, tp->snd_up))
+		if (unlikely((sacked & TCPCB_URG) && tp->urg_mode &&
+			     !before(end_seq, tp->snd_up)))
 			tp->urg_mode = 0;
 
 		tp->packets_out -= packets_acked;