projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
89d478f
)
[TCP]: Add unlikely() to urgent handling in clean_rtx_queue
author
Ilpo Järvinen
<ilpo.jarvinen@helsinki.fi>
Sat, 1 Dec 2007 22:48:04 +0000
(
00:48
+0200)
committer
David 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
patch
|
blob
|
history
diff --git
a/net/ipv4/tcp_input.c
b/net/ipv4/tcp_input.c
index
6bc594a
..
8e4d74e
100644
(file)
--- 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;