diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-08 20:27:17 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-08 20:27:25 (GMT) |
| commit | 63f2cd32fb5f8541636f47cc4c7c53cf8284851f (patch) | |
| tree | d8e66fde55f70332fd495907d529996e9568038b /net/tipc | |
| parent | 47d2261a3fa71cde24263559a4219a25e50d8c89 (diff) | |
| parent | 2acf1c25b979aaae983bfd7c0c4dd04b31ccfc01 (diff) | |
| download | linux-fsl-qoriq-63f2cd32fb5f8541636f47cc4c7c53cf8284851f.tar.xz | |
Merge remote-tracking branch 'stable/linux-3.12.y' into sdk-v1.6.x
Signed-off-by: Scott Wood <scottwood@freescale.com>
Conflicts:
drivers/mmc/card/block.c
Diffstat (limited to 'net/tipc')
| -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 6cc7ddd..dffdbea 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -984,9 +984,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: @@ -1095,9 +1092,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); |