lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:

	drivers/net/e1000e/ich8lan.c
	drivers/net/e1000e/netdev.c
This commit is contained in:
David S. Miller
2008-10-08 14:56:41 -07:00
parent 071d7ab664 69849375d6
commit 4dd565134e
139 changed files with 1739 additions and 1048 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/ipv4/tcp_input.c
View File

@@ -4957,7 +4957,8 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
goto no_ack;
}
__tcp_ack_snd_check(sk, 0);
if (!copied_early || tp->rcv_nxt != tp->rcv_wup)
__tcp_ack_snd_check(sk, 0);
no_ack:
#ifdef CONFIG_NET_DMA
if (copied_early)