diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-08 17:56:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-08 17:56:41 -0400 |
| commit | 4dd565134ece7e5d528d4c5288879310c54419e9 (patch) | |
| tree | e08910d2d0feae0c030f8f01acc9b03eb760ad9a /net/ipv4/tcp_input.c | |
| parent | 071d7ab6649eb34a873a53e71635186e9117101d (diff) | |
| parent | 69849375d6b13e94d08cdc94b49b11fbab454a0e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/netdev.c
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 63da39372d40..d77c0d29e239 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
| @@ -4957,7 +4957,8 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb, | |||
| 4957 | goto no_ack; | 4957 | goto no_ack; |
| 4958 | } | 4958 | } |
| 4959 | 4959 | ||
| 4960 | __tcp_ack_snd_check(sk, 0); | 4960 | if (!copied_early || tp->rcv_nxt != tp->rcv_wup) |
| 4961 | __tcp_ack_snd_check(sk, 0); | ||
| 4961 | no_ack: | 4962 | no_ack: |
| 4962 | #ifdef CONFIG_NET_DMA | 4963 | #ifdef CONFIG_NET_DMA |
| 4963 | if (copied_early) | 4964 | if (copied_early) |