From: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Date: Sun, 11 Nov 2007 05:23:08 +0000 (-0800)
Subject: [TCP]: Add unlikely() to sacktag out-of-mem in fragment case
X-Git-Tag: v2.6.24-rc3~155^2~35
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e49aa5d456802c6bec59b29d1d7cbd8e9cc71709;p=linux-2.6-omap-h63xx.git

[TCP]: Add unlikely() to sacktag out-of-mem in fragment case

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 9fc9096ada8..84bcdc94dfa 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -1400,7 +1400,7 @@ tcp_sacktag_write_queue(struct sock *sk, struct sk_buff *ack_skb, u32 prior_snd_
 			/* DSACK info lost if out-of-mem, try SACK still */
 			if (in_sack <= 0)
 				in_sack = tcp_match_skb_to_sack(sk, skb, start_seq, end_seq);
-			if (in_sack < 0)
+			if (unlikely(in_sack < 0))
 				break;
 
 			sacked = TCP_SKB_CB(skb)->sacked;