Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e49aa5d456802c6bec59b29d1d7cbd8e9cc71709 Commit: e49aa5d456802c6bec59b29d1d7cbd8e9cc71709 Parent: c7caf8d3ed7a6617aa0a3083815c439bd952c45c Author: Ilpo J�rvinen <[EMAIL PROTECTED]> AuthorDate: Sat Nov 10 21:23:08 2007 -0800 Committer: David S. Miller <[EMAIL PROTECTED]> CommitDate: Sat Nov 10 21:23:08 2007 -0800
[TCP]: Add unlikely() to sacktag out-of-mem in fragment case Signed-off-by: Ilpo J�rvinen <[EMAIL PROTECTED]> Signed-off-by: David S. Miller <[EMAIL PROTECTED]> --- net/ipv4/tcp_input.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 9fc9096..84bcdc9 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; - 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