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/tipc/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/tipc/socket.c')
| -rw-r--r-- | net/tipc/socket.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 7e26ad416af1..2b1d7c2d677d 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -905,9 +905,6 @@ static int recv_msg(struct kiocb *iocb, struct socket *sock, goto exit; } - /* will be updated in set_orig_addr() if needed */ - m->msg_namelen = 0; - timeout = sock_rcvtimeo(sk, flags & MSG_DONTWAIT); restart: @@ -1017,9 +1014,6 @@ static int recv_stream(struct kiocb *iocb, struct socket *sock, goto exit; } - /* will be updated in set_orig_addr() if needed */ - m->msg_namelen = 0; - target = sock_rcvlowat(sk, flags & MSG_WAITALL, buf_len); timeout = sock_rcvtimeo(sk, flags & MSG_DONTWAIT); |