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/wireless/ath5k/base.c
	net/8021q/vlan_core.c
This commit is contained in:
David S. Miller
2008-11-06 22:43:03 -08:00
parent 61c9eaf900 4bab0ea1d4
commit 9eeda9abd1
739 changed files with 7279 additions and 6648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/ipv4/tcp.c
View File

@@ -1374,8 +1374,7 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
sk->sk_state == TCP_CLOSE ||
(sk->sk_shutdown & RCV_SHUTDOWN) ||
!timeo ||
signal_pending(current) ||
(flags & MSG_PEEK))
signal_pending(current))
break;
} else {
if (sock_flag(sk, SOCK_DONE))