aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>2007-12-02 00:48:04 +0200
committerDavid S. Miller <davem@davemloft.net>2008-01-28 14:55:45 -0800
commitea60658cde9f4df7d05b95c81a72a95ad07f0701 (patch)
treeb71e5bc6208adc2f8ef814844f9324a7d439dfb3
parent89d478f7f2160780be9d7c9c6bac9bd350d9ed96 (diff)
[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>
-rw-r--r--net/ipv4/tcp_input.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 6bc594a63c9..8e4d74ee31e 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;