From d3d57accd2dbc31d63817b1a301c75573445ee48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Date: Sun, 2 Dec 2007 00:48:04 +0200 Subject: [PATCH] --- yaml --- r: 78270 b: refs/heads/master c: ea60658cde9f4df7d05b95c81a72a95ad07f0701 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_input.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 482e4e6587d1..e85afebc686b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89d478f7f2160780be9d7c9c6bac9bd350d9ed96 +refs/heads/master: ea60658cde9f4df7d05b95c81a72a95ad07f0701 diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c index 6bc594a63c9d..8e4d74ee31e2 100644 --- a/trunk/net/ipv4/tcp_input.c +++ b/trunk/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;