diff options
author | Ursula Braun <ubraun@linux.vnet.ibm.com> | 2009-04-23 09:37:16 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-04-23 09:37:16 -0400 |
commit | d93fe1a144c1a4312972bedbefc2213aa8b88612 (patch) | |
tree | 5b79f04234ecc96245a95a1191d677d03d6955b3 /net/iucv | |
parent | 5802b140ed52957ad150eaf40239a95f5f45fbd3 (diff) |
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>
Diffstat (limited to 'net/iucv')
-rw-r--r-- | net/iucv/af_iucv.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c index 0fc00087ea8b..a9b3a6f9ea95 100644 --- a/net/iucv/af_iucv.c +++ b/net/iucv/af_iucv.c | |||
@@ -982,8 +982,6 @@ static int iucv_sock_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
982 | if (flags & (MSG_OOB)) | 982 | if (flags & (MSG_OOB)) |
983 | return -EOPNOTSUPP; | 983 | return -EOPNOTSUPP; |
984 | 984 | ||
985 | target = sock_rcvlowat(sk, flags & MSG_WAITALL, len); | ||
986 | |||
987 | /* receive/dequeue next skb: | 985 | /* receive/dequeue next skb: |
988 | * the function understands MSG_PEEK and, thus, does not dequeue skb */ | 986 | * the function understands MSG_PEEK and, thus, does not dequeue skb */ |
989 | skb = skb_recv_datagram(sk, flags, noblock, &err); | 987 | 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) | |||
1429 | iucv_process_message(sk, skb, path, msg); | 1427 | iucv_process_message(sk, skb, path, msg); |
1430 | goto out_unlock; | 1428 | goto out_unlock; |
1431 | 1429 | ||
1432 | return; | ||
1433 | |||
1434 | save_message: | 1430 | save_message: |
1435 | save_msg = kzalloc(sizeof(struct sock_msg_q), GFP_ATOMIC | GFP_DMA); | 1431 | save_msg = kzalloc(sizeof(struct sock_msg_q), GFP_ATOMIC | GFP_DMA); |
1436 | if (!save_msg) | 1432 | if (!save_msg) |