From 47690b0cbea4f0bec48762d7e790befcfb609f1c Mon Sep 17 00:00:00 2001 From: Ursula Braun Date: Thu, 23 Apr 2009 06:37:16 -0700 Subject: [PATCH] --- yaml --- r: 149823 b: refs/heads/master c: d93fe1a144c1a4312972bedbefc2213aa8b88612 h: refs/heads/master i: 149821: 251a36e284b7acfa6cb496794f726c204416bfa7 149819: eb00f9c033fe37220dac7424bebf9413f643932f 149815: 6cb5084c5327da39a72c77ecf69271f9dd8ac668 149807: 2d3b3b893a27b3508ba7f08d2169e3c48d14ab80 149791: 60993685fed92aea8d4a60fdebe1fb8ac8f1ee36 149759: 00c6ac31af2a3c909da8e64560819b8267f2ff1f v: v3 --- [refs] | 2 +- trunk/net/iucv/af_iucv.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b846ffcf404c..8da4bedf0d30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5802b140ed52957ad150eaf40239a95f5f45fbd3 +refs/heads/master: d93fe1a144c1a4312972bedbefc2213aa8b88612 diff --git a/trunk/net/iucv/af_iucv.c b/trunk/net/iucv/af_iucv.c index 0fc00087ea8b..a9b3a6f9ea95 100644 --- a/trunk/net/iucv/af_iucv.c +++ b/trunk/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)