diff options
author | 2013-04-07 18:37:01 -0400 | |
---|---|---|
committer | 2013-04-07 18:37:01 -0400 | |
commit | d978a6361ad13f1f9694fcb7b5852d253a544d92 (patch) | |
tree | 8e8a8c62286fab2c044c4b53563222c1b66d7cb0 /net/iucv/af_iucv.c | |
parent | decnet: remove duplicated include from dn_table.c (diff) | |
parent | bnx2x: Fix KR2 rapid link flap (diff) | |
download | linux-d978a6361ad13f1f9694fcb7b5852d253a544d92.tar.gz linux-d978a6361ad13f1f9694fcb7b5852d253a544d92.tar.bz2 linux-d978a6361ad13f1f9694fcb7b5852d253a544d92.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/nfc/microread/mei.c
net/netfilter/nfnetlink_queue_core.c
Pull in 'net' to get Eric Biederman's AF_UNIX fix, upon which
some cleanups are going to go on-top.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/iucv/af_iucv.c')
-rw-r--r-- | net/iucv/af_iucv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c index 7dfb9ed93698..e165e8dc962e 100644 --- a/net/iucv/af_iucv.c +++ b/net/iucv/af_iucv.c @@ -1328,6 +1328,8 @@ static int iucv_sock_recvmsg(struct kiocb *iocb, struct socket *sock, struct sk_buff *skb, *rskb, *cskb; int err = 0; + msg->msg_namelen = 0; + if ((sk->sk_state == IUCV_DISCONN) && skb_queue_empty(&iucv->backlog_skb_q) && skb_queue_empty(&sk->sk_receive_queue) && |