[illumos-gate merge]

commit e5c421abb8bd517cb6964747b9ce23066e1a1cef
    9266 ixgbe: this statement may fall through
commit 8a7aa2a592747bd90d85645126d80688e024a0e2
    9673 move internet address manipulation functions to libc
commit 7e3488dc6cdcb0c04e1ce167a1a3bfef83b5f2e0
    9610 qede: error: left shift of negative value
commit d972451485b9ccf8c5c4951e2d24f63da9ac2cc8
    9609 qede: error: result of '983040 << 16' requires 37 bits to represent, but 'int' only has 32 bits
commit 3df3d01f9da8be5cdd1e81a5d050c24ccc55caa9
    9608 qede: error: 'free_buffer_count' may be used uninitialized in this function
commit 0d7de619fa7b28e48c8e80fa26d724400f4f47a4
    9607 qede: this statement may fall through
commit 77b62fe435d195b5a58f123e6c5ec9c9dffdc877
    9606 qede: error: this 'for' clause does not guard

	Conflicts:
	usr/src/man/man1m/route.1m
	usr/src/lib/libdladm/Makefile.com

1 files changed, 2 insertions, 8 deletions

diff --git a/usr/src/man/man3socket/getipnodebyname.3socket b/usr/src/man/man3socket/getipnodebyname.3socket
index 9b68ea15ff..7eca1e3892 100644
--- a/usr/src/man/man3socket/getipnodebyname.3socket
+++ b/usr/src/man/man3socket/getipnodebyname.3socket
@@ -29,7 +29,6 @@ getipnodebyname, getipnodebyaddr, freehostent \- get IP node entry
 .fi
 
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIaf\fR\fR
@@ -93,7 +92,6 @@ Pointer to \fBhostent\fR structure
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBgetipnodebyname()\fR function searches the \fBipnodes\fR database from
 the beginning. The function finds the first \fBh_name\fR member that matches
@@ -254,7 +252,7 @@ The special flags value, \fBAI_DEFAULT\fR, is defined as
 .LP
 The \fBgetipnodebyname()\fR function allows the \fIname\fR argument to be a
 node name or a literal address string: a dotted-decimal IPv4 address or an IPv6
-hex address. Applications do not have to call \fBinet_pton\fR(3SOCKET) to
+hex address. Applications do not have to call \fBinet_pton\fR(3C) to
 handle literal address strings.
 .sp
 .LP
@@ -310,7 +308,6 @@ terminated by a \fINULL\fR pointer.
 .RE
 
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, \fBgetipnodebyname()\fR and \fBgetipnodebyaddr()\fR
 return a \fBhostent\fR structure. Otherwise they return \fINULL\fR.
@@ -489,7 +486,6 @@ hostname.
 .in -2
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -507,13 +503,11 @@ MT-Level	Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBgetaddrinfo\fR(3SOCKET), \fBgethostbyname\fR(3NSL), \fBhtonl\fR(3SOCKET),
 \fBinet\fR(3SOCKET), \fBnetdb.h\fR(3HEAD), \fBhosts\fR(4),
 \fBnsswitch.conf\fR(4), \fBattributes\fR(5)
 .SH NOTES
-.sp
 .LP
 No enumeration functions are provided for IPv6. Existing enumeration functions
 such as \fBsethostent\fR(3NSL) do not work in combination with the
@@ -544,6 +538,6 @@ addresses.
 The form for an address of type \fBAF_INET\fR is a \fBstruct in_addr\fR defined
 in <\fBnetinet/in.h\fR>. The form for an address of type \fBAF_INET6\fR is a
 \fBstruct in6_addr\fR, also defined in <\fBnetinet/in.h\fR>. The functions
-described in \fBinet_ntop\fR(3SOCKET) and \fBinet_pton\fR(3SOCKET) that are
+described in \fBinet_ntop\fR(3C) and \fBinet_pton\fR(3C) that are
 illustrated in the EXAMPLES section are helpful in constructing and
 manipulating addresses in either of these forms.