diff options
| author | Ursula Braun <ubraun@linux.vnet.ibm.com> | 2009-04-23 15:37:16 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-23 15:37:16 +0200 |
| commit | d93fe1a144c1a4312972bedbefc2213aa8b88612 (patch) | |
| tree | 5b79f04234ecc96245a95a1191d677d03d6955b3 | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne... (diff) | |
| download | linux-d93fe1a144c1a4312972bedbefc2213aa8b88612.tar.xz linux-d93fe1a144c1a4312972bedbefc2213aa8b88612.zip | |
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>
| -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, 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) |