Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33ddcbbf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 4d45cbac 9eb5c94e

net/decnet/af_decnet.c

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

	}



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

	if (rv)

		goto out;



	if (sk->sk_shutdown & RCV_SHUTDOWN) {

		if (!(flags & MSG_NOSIGNAL))

			send_sig(SIGPIPE, current, 0);

		rv = -EPIPE;

		rv = 0;

		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)) {

		rv = -EOPNOTSUPP;

		goto out;
@@ -1928,6 +1926,8 @@ static int dn_sendmsg(struct kiocb *iocb, struct socket *sock, 


	if (sk->sk_shutdown & SEND_SHUTDOWN) {

		err = -EPIPE;

		if (!(flags & MSG_NOSIGNAL))

			send_sig(SIGPIPE, current, 0);

		goto out_err;

	}