diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-27 22:07:02 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-27 22:07:02 -0400 |
| commit | 1f15d694522af9cd7492695f11dd2dc77b6cf098 (patch) | |
| tree | 7f67a4c38456ec73359d576a5c602d18c3c3ef72 /net/ipv4/tcp_input.c | |
| parent | fff9cfd99c0f88645c3f50d7476d6c8cef99f140 (diff) | |
| parent | 254feb882a7c6e4e51416dff6a97d847fbbba551 (diff) | |
Automatic merge of /spare/repo/netdev-2.6 branch master
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, | |||
| 4355 | goto no_ack; | 4355 | goto no_ack; |
| 4356 | } | 4356 | } |
| 4357 | 4357 | ||
| 4358 | if (eaten) { | 4358 | __tcp_ack_snd_check(sk, 0); |
| 4359 | if (tcp_in_quickack_mode(tp)) { | ||
| 4360 | tcp_send_ack(sk); | ||
| 4361 | } else { | ||
| 4362 | tcp_send_delayed_ack(sk); | ||
| 4363 | } | ||
| 4364 | } else { | ||
| 4365 | __tcp_ack_snd_check(sk, 0); | ||
| 4366 | } | ||
| 4367 | |||
| 4368 | no_ack: | 4359 | no_ack: |
| 4369 | if (eaten) | 4360 | if (eaten) |
| 4370 | __kfree_skb(skb); | 4361 | __kfree_skb(skb); |