]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[TCP]: Add unlikely() to urgent handling in clean_rtx_queue
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Sat, 1 Dec 2007 22:48:04 +0000 (00:48 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Jan 2008 22:55:45 +0000 (14:55 -0800)
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>
net/ipv4/tcp_input.c

index 6bc594a63c9de29bb58114fe973e14c116bf4f80..8e4d74ee31e2fe53794df3c96b8dbb064c48d11e 100644 (file)
@@ -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;