diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-12-17 08:41:49 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-12-17 08:41:49 -0500 |
| commit | c03aae7f627d83b2fa80550671947002515f10fc (patch) | |
| tree | 4e3f0a8aa66b68ac0a279271cdc716765ca1cbda /net/caif/caif_socket.c | |
| parent | 67a8032136484766fb109303006b4a2a20ce8abf (diff) | |
| parent | 184c20bbc978eb7a2e1d3637b7864208822c7ebc (diff) | |
Merge tag 'v3.10.23' into v3.10-rt
This is the 3.10.23 stable release
Diffstat (limited to 'net/caif/caif_socket.c')
| -rw-r--r-- | net/caif/caif_socket.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c index 05a41c7ec304..d6be3edb7a43 100644 --- a/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c @@ -286,8 +286,6 @@ static int caif_seqpkt_recvmsg(struct kiocb *iocb, struct socket *sock, if (m->msg_flags&MSG_OOB) goto read_error; - m->msg_namelen = 0; - skb = skb_recv_datagram(sk, flags, 0 , &ret); if (!skb) goto read_error; @@ -361,8 +359,6 @@ static int caif_stream_recvmsg(struct kiocb *iocb, struct socket *sock, if (flags&MSG_OOB) goto out; - msg->msg_namelen = 0; - /* * Lock the socket to prevent queue disordering * while sleeps in memcpy_tomsg |