diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-04 11:56:38 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-04 11:56:38 -0700 |
| commit | 21a180cda012e1f93e362dd4a9b0bfd3d8c92940 (patch) | |
| tree | 0e0d10baa3fdcd8ffbc6881076ff1695808dad9d /net/core | |
| parent | c7d4426a98a5f6654cd0b4b33d9dab2e77192c18 (diff) | |
| parent | 51e97a12bef19b7e43199fc153cf9bd5f2140362 (diff) | |
| download | linux-21a180cda012e1f93e362dd4a9b0bfd3d8c92940.tar.gz linux-21a180cda012e1f93e362dd4a9b0bfd3d8c92940.tar.bz2 linux-21a180cda012e1f93e362dd4a9b0bfd3d8c92940.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/ipv4/Kconfig
net/ipv4/tcp_timer.c
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/iovec.c | 5 | ||||
| -rw-r--r-- | net/core/stream.c | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/net/core/iovec.c b/net/core/iovec.c index f4657c2127b4..72aceb1fe4fa 100644 --- a/net/core/iovec.c +++ b/net/core/iovec.c @@ -35,9 +35,10 @@ * in any case. */ -int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address, int mode) +long verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address, int mode) { - int size, err, ct; + int size, ct; + long err; if (m->msg_namelen) { if (mode == VERIFY_READ) { diff --git a/net/core/stream.c b/net/core/stream.c index d959e0f41528..f5df85dcd20b 100644 --- a/net/core/stream.c +++ b/net/core/stream.c @@ -141,10 +141,10 @@ int sk_stream_wait_memory(struct sock *sk, long *timeo_p) set_bit(SOCK_NOSPACE, &sk->sk_socket->flags); sk->sk_write_pending++; - sk_wait_event(sk, ¤t_timeo, !sk->sk_err && - !(sk->sk_shutdown & SEND_SHUTDOWN) && - sk_stream_memory_free(sk) && - vm_wait); + sk_wait_event(sk, ¤t_timeo, sk->sk_err || + (sk->sk_shutdown & SEND_SHUTDOWN) || + (sk_stream_memory_free(sk) && + !vm_wait)); sk->sk_write_pending--; if (vm_wait) { |