Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 149823
b: refs/heads/master
c: d93fe1a
h: refs/heads/master
i:
  149821: 251a36e
  149819: eb00f9c
  149815: 6cb5084
  149807: 2d3b3b8
  149791: 6099368
  149759: 00c6ac3
v: v3
  • Loading branch information
Ursula Braun authored and David S. Miller committed Apr 23, 2009
1 parent 08b8c73 commit 47690b0
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5802b140ed52957ad150eaf40239a95f5f45fbd3
refs/heads/master: d93fe1a144c1a4312972bedbefc2213aa8b88612
4 changes: 0 additions & 4 deletions trunk/net/iucv/af_iucv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 47690b0

Please sign in to comment.