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

Commit d93fe1a1 authored by Ursula Braun's avatar Ursula Braun Committed by David S. Miller
Browse files

af_iucv: Fix merge. 



From: Ursula Braun <ubraun@linux.vnet.ibm.com>

net/iucv/af_iucv.c in net-next-2.6 is almost correct. 4 lines should
still be deleted. These are the remaining changes:

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5802b140

net/iucv/af_iucv.c

+0 −4
Original line number Diff line number Diff line
@@ -982,8 +982,6 @@ static int iucv_sock_recvmsg(struct kiocb *iocb, struct socket *sock, 
	if (flags & (MSG_OOB))

		return -EOPNOTSUPP;



	target = sock_rcvlowat(sk, flags & MSG_WAITALL, len);



	/* receive/dequeue next skb:

	 * the function understands MSG_PEEK and, thus, does not dequeue skb */

	skb = skb_recv_datagram(sk, flags, noblock, &err);
@@ -1429,8 +1427,6 @@ static void iucv_callback_rx(struct iucv_path *path, struct iucv_message *msg) 
	iucv_process_message(sk, skb, path, msg);

	goto out_unlock;



	return;



save_message:

	save_msg = kzalloc(sizeof(struct sock_msg_q), GFP_ATOMIC | GFP_DMA);

	if (!save_msg)