diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-10-24 14:07:14 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-10-24 14:07:14 +0000 |
| commit | 72313197becf405ef4e91a54aa4691e4a55868d1 (patch) | |
| tree | f268b3723d709ebdc46bf2136291cd04b27f7650 /usr/src/uts/common/inet/tcp/tcp.c | |
| parent | 9812695da2de32f90ea47ba21e78e29437e4de8f (diff) | |
| parent | a2e92fdb91a6e5451ecb5488b74ee1e95a4bafd0 (diff) | |
| download | illumos-joyent-72313197becf405ef4e91a54aa4691e4a55868d1.tar.gz | |
[illumos-gate merge]
commit a2e92fdb91a6e5451ecb5488b74ee1e95a4bafd0
11691 ptree could show service FMRIs
commit 3ef756924267e272e432add760e4dc8597faef89
11849 listen of IPv6 address fails with EAFNOSUPPORT
commit 125965389c591835d37b560971900f263cc8f988
11844 add rdmsr utility
Conflicts:
usr/src/man/man1m/Makefile
usr/src/man/man1/ptree.1
usr/src/cmd/ptools/ptree/ptree.c
Diffstat (limited to 'usr/src/uts/common/inet/tcp/tcp.c')
| -rw-r--r-- | usr/src/uts/common/inet/tcp/tcp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr/src/uts/common/inet/tcp/tcp.c b/usr/src/uts/common/inet/tcp/tcp.c index 1f4025a50c..ef4c96db1c 100644 --- a/usr/src/uts/common/inet/tcp/tcp.c +++ b/usr/src/uts/common/inet/tcp/tcp.c @@ -21,7 +21,7 @@ /* * Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2017 Joyent, Inc. + * Copyright 2019 Joyent, Inc. * Copyright (c) 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2013, 2017 by Delphix. All rights reserved. * Copyright 2014, OmniTI Computer Consulting, Inc. All rights reserved. @@ -4349,11 +4349,11 @@ tcp_do_listen(conn_t *connp, struct sockaddr *sa, socklen_t len, } return (-TOUTSTATE); } else { - if (sa == NULL) { - sin6_t addr; - sin_t *sin; - sin6_t *sin6; + sin6_t addr; + sin_t *sin; + sin6_t *sin6; + if (sa == NULL) { ASSERT(IPCL_IS_NONSTR(connp)); /* Do an implicit bind: Request for a generic port. */ if (connp->conn_family == AF_INET) { |