---

yaml --- r: 78270 b: refs/heads/master c: ea60658 h: refs/heads/master v: v3
git-mirror · Jan 28, 2008 · d3d57ac · d3d57ac
1 parent 7844a7b
commit d3d57ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;