diff options
| author | Scott Wood <scottwood@freescale.com> | 2013-10-29 19:50:27 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2013-10-29 19:50:37 (GMT) |
| commit | d0ebef8230e267ec47d4d4a65fe3262e2ebb8026 (patch) | |
| tree | 24b8bb342576f543dac42d59821c4feb7ce07453 /net/tipc | |
| parent | 041f2bc64a985b30328de4cb596f04fd913a85de (diff) | |
| download | linux-fsl-qoriq-d0ebef8230e267ec47d4d4a65fe3262e2ebb8026.tar.xz | |
Revert to v3.8 (no RT, no stable)
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/socket.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index fc906d9..9b4e483 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -806,7 +806,6 @@ static void set_orig_addr(struct msghdr *m, struct tipc_msg *msg) if (addr) { addr->family = AF_TIPC; addr->addrtype = TIPC_ADDR_ID; - memset(&addr->addr, 0, sizeof(addr->addr)); addr->addr.id.ref = msg_origport(msg); addr->addr.id.node = msg_orignode(msg); addr->addr.name.domain = 0; /* could leave uninitialized */ @@ -921,9 +920,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: @@ -1033,9 +1029,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); |