Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ea60658cde9f4df7d05b95c81a72a95ad07f0701
Commit: ea60658cde9f4df7d05b95c81a72a95ad07f0701
Parent: 89d478f7f2160780be9d7c9c6bac9bd350d9ed96
Author: Ilpo Järvinen <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 2 00:48:04 2007 +0200
Committer: David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 14:55:45 2008 -0800
[TCP]: Add unlikely() to urgent handling in clean_rtx_queue
Signed-off-by: Ilpo Järvinen <[EMAIL PROTECTED]>
Signed-off-by: Herbert Xu <[EMAIL PROTECTED]>
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
net/ipv4/tcp_input.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 6bc594a..8e4d74e 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
