Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (33ddcbbf) · Commits · e / devices / android_kernel_sony_msm8998

net/decnet/af_decnet.c

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -1664,17 +1664,15 @@ static int dn_recvmsg(struct kiocb iocb, struct socket sock,
	goto out;		goto out;
	}		}

	rv = dn_check_state(sk, NULL, 0, &timeo, flags);
	if (rv)
	goto out;

	if (sk->sk_shutdown & RCV_SHUTDOWN) {		if (sk->sk_shutdown & RCV_SHUTDOWN) {
	if (!(flags & MSG_NOSIGNAL))		rv = 0;
	send_sig(SIGPIPE, current, 0);
	rv = -EPIPE;
	goto out;		goto out;
	}		}

			rv = dn_check_state(sk, NULL, 0, &timeo, flags);
			if (rv)
			goto out;

	if (flags & ~(MSG_PEEK\|MSG_OOB\|MSG_WAITALL\|MSG_DONTWAIT\|MSG_NOSIGNAL)) {		if (flags & ~(MSG_PEEK\|MSG_OOB\|MSG_WAITALL\|MSG_DONTWAIT\|MSG_NOSIGNAL)) {
	rv = -EOPNOTSUPP;		rv = -EOPNOTSUPP;
	goto out;		goto out;
	@@ -1928,6 +1926,8 @@ static int dn_sendmsg(struct kiocb iocb, struct socket sock,

	if (sk->sk_shutdown & SEND_SHUTDOWN) {		if (sk->sk_shutdown & SEND_SHUTDOWN) {
	err = -EPIPE;		err = -EPIPE;
			if (!(flags & MSG_NOSIGNAL))
			send_sig(SIGPIPE, current, 0);
	goto out_err;		goto out_err;
	}		}