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: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
5802b140ed
commit
d93fe1a144
|
@ -982,8 +982,6 @@ static int iucv_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
|
||||||
if (flags & (MSG_OOB))
|
if (flags & (MSG_OOB))
|
||||||
return -EOPNOTSUPP;
|
return -EOPNOTSUPP;
|
||||||
|
|
||||||
target = sock_rcvlowat(sk, flags & MSG_WAITALL, len);
|
|
||||||
|
|
||||||
/* receive/dequeue next skb:
|
/* receive/dequeue next skb:
|
||||||
* the function understands MSG_PEEK and, thus, does not dequeue skb */
|
* the function understands MSG_PEEK and, thus, does not dequeue skb */
|
||||||
skb = skb_recv_datagram(sk, flags, noblock, &err);
|
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);
|
iucv_process_message(sk, skb, path, msg);
|
||||||
goto out_unlock;
|
goto out_unlock;
|
||||||
|
|
||||||
return;
|
|
||||||
|
|
||||||
save_message:
|
save_message:
|
||||||
save_msg = kzalloc(sizeof(struct sock_msg_q), GFP_ATOMIC | GFP_DMA);
|
save_msg = kzalloc(sizeof(struct sock_msg_q), GFP_ATOMIC | GFP_DMA);
|
||||||
if (!save_msg)
|
if (!save_msg)
|
||||||
|
|
Loading…
Reference in New Issue