diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-05-25 09:38:26 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-05-25 09:38:26 +0100 |
| commit | c1c58ada91cfe86f19d430282132434e620a1067 (patch) | |
| tree | cd12933040a65398e9779c3596f5109e37c206c3 /net/ipv4/tcp_input.c | |
| parent | 67394f8f069c2fdf90f3b6d851824c07815442af (diff) | |
| parent | 2a24ab628aa7b190be32f63dfb6d96f3fb61580a (diff) | |
Merge with /usr/src/ntfs-2.6.git
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 79835a67a274..5bad504630a3 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -4355,16 +4355,7 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb, goto no_ack; } - if (eaten) { - if (tcp_in_quickack_mode(tp)) { - tcp_send_ack(sk); - } else { - tcp_send_delayed_ack(sk); - } - } else { - __tcp_ack_snd_check(sk, 0); - } - + __tcp_ack_snd_check(sk, 0); no_ack: if (eaten) __kfree_skb(skb); |