From 6239524f0f2c918e99db0e7041b4b83a6af889bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilpo=20J=E4rvinen?= Date: Sat, 10 Nov 2007 21:23:08 -0800 Subject: [PATCH] --- yaml --- r: 73515 b: refs/heads/master c: e49aa5d456802c6bec59b29d1d7cbd8e9cc71709 h: refs/heads/master i: 73513: 93a063c1290695426d6a7d76c4a3968531dff6c4 73511: d3d3b4238e3e7751a60b308bc7e89baca2b86cca v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_input.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 22b0a06dffbe..ccbafdf4f681 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7caf8d3ed7a6617aa0a3083815c439bd952c45c +refs/heads/master: e49aa5d456802c6bec59b29d1d7cbd8e9cc71709 diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c index 9fc9096ada8a..84bcdc94dfa9 100644 --- a/trunk/net/ipv4/tcp_input.c +++ b/trunk/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;