3 files changed, 38 insertions, 8 deletions
diff --git a/usr/src/man/man1m/ping.1m b/usr/src/man/man1m/ping.1m
index 6aa5ecc604..3c40dd9b00 100644
--- a/usr/src/man/man1m/ping.1m
+++ b/usr/src/man/man1m/ping.1m
@@ -1,5 +1,6 @@
 '\" te
 .\" Copyright (C) 2006, Sun Microsystems, Inc. All Rights Reserved
+.\" Copyright (C) 2015, Joyent, Inc.
 .\" Copyright 1989 AT&T
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
@@ -15,7 +16,7 @@ ping \- send ICMP (ICMP6) ECHO_REQUEST packets to network hosts
 
 .LP
 .nf
-\fB/usr/sbin/ping\fR \fB-s\fR [\fB-l\fR | \fB-U\fR] [\fB-abdlLnrRv\fR] [\fB-A\fR \fIaddr_family\fR]
+\fB/usr/sbin/ping\fR \fB-s\fR [\fB-l\fR | \fB-U\fR] [\fB-abdDlLnrRv\fR] [\fB-A\fR \fIaddr_family\fR]
      [\fB-c\fR \fItraffic_class\fR] [\fB-g\fR \fIgateway\fR [\fB-g\fR \fIgateway\fR...]]
      [\fB-N\fR \fInext_hop_router\fR] [\fB-F\fR \fIflow_label\fR] [\fB-I\fR \fIinterval\fR]
      [\fB-i\fR \fIinterface\fR] [\fB-P\fR \fItos\fR] [\fB-p\fR \fIport\fR] [\fB-t\fR \fIttl\fR] \fIhost\fR
@@ -23,7 +24,6 @@ ping \- send ICMP (ICMP6) ECHO_REQUEST packets to network hosts
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The utility \fBping\fR utilizes the \fBICMP\fR (\fBICMP6\fR in IPv6) protocol's
 \fBECHO_REQUEST\fR datagram to elicit an \fBICMP\fR (\fBICMP6\fR)
@@ -68,7 +68,6 @@ displays a summary of this information upon termination or timeout. The default
 When using \fBping\fR for fault isolation, first \fBping\fR the local host to
 verify that the local network interface is running.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -100,6 +99,15 @@ host is unknown and exits.
 .sp
 .ne 2
 .na
+.B -D
+.ad
+.RS 24n
+Specifies that the don't fragment bit should be set.
+.RE
+
+.sp
+.ne 2
+.na
 \fB\fB-F\fR\ \fIflow_label\fR\fR
 .ad
 .RS 24n
@@ -336,7 +344,6 @@ from the target host.
 .RE
 
 .SH OPERANDS
-.sp
 .ne 2
 .na
 \fB\fIhost\fR\fR
@@ -389,7 +396,6 @@ This example shows the \fBndd\fR module, \fB/dev/icmp\fR, used to set the
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -412,7 +418,6 @@ machine was not alive.
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBifconfig\fR(1M), \fBin.routed\fR(1M), \fBndd\fR(1M), \fBnetstat\fR(1M),
 \fBrpcinfo\fR(1M), \fBtraceroute\fR(1M), \fBattributes\fR(5), \fBicmp\fR(7P),
diff --git a/usr/src/man/man3socket/Makefile b/usr/src/man/man3socket/Makefile
index c4bbd116c7..53a6e475e8 100644
--- a/usr/src/man/man3socket/Makefile
+++ b/usr/src/man/man3socket/Makefile
@@ -155,9 +155,11 @@ ntohll.3socket			:= LINKSRC = byteorder.3socket
 ntohs.3socket			:= LINKSRC = byteorder.3socket
 
 ether_aton.3socket		:= LINKSRC = ethers.3socket
+ether_aton_r.3socket		:= LINKSRC = ethers.3socket
 ether_hostton.3socket		:= LINKSRC = ethers.3socket
 ether_line.3socket		:= LINKSRC = ethers.3socket
 ether_ntoa.3socket		:= LINKSRC = ethers.3socket
+ether_ntoa_r.3socket		:= LINKSRC = ethers.3socket
 ether_ntohost.3socket		:= LINKSRC = ethers.3socket
 
 freeaddrinfo.3socket		:= LINKSRC = getaddrinfo.3socket
diff --git a/usr/src/man/man3socket/ethers.3socket b/usr/src/man/man3socket/ethers.3socket
index 94cec9c957..377a0b884f 100644
--- a/usr/src/man/man3socket/ethers.3socket
+++ b/usr/src/man/man3socket/ethers.3socket
@@ -1,12 +1,13 @@
 '\" te
 .\" Copyright 1989 AT&T.
 .\" Copyright (C) 2004, Sun Microsystems, Inc. All Rights Reserved.
+.\" Copyright (C) 2014, Joyent, Inc. All Rights Reserved.
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH ETHERS 3SOCKET "Apr 5, 2004"
+.TH ETHERS 3SOCKET "Aug 9, 2014"
 .SH NAME
-ethers, ether_ntoa, ether_aton, ether_ntohost, ether_hostton, ether_line \-
+ethers, ether_ntoa, ether_ntoa_r, ether_aton, ether_aton_r, ether_ntohost, ether_hostton, ether_line \-
 Ethernet address mapping operations
 .SH SYNOPSIS
 .LP
@@ -20,11 +21,21 @@ Ethernet address mapping operations
 
 .LP
 .nf
+\fBchar *\fR\fBether_ntoa_r\fR(\fBconst struct ether_addr *\fR\fIe\fR, \fBchar *\fR\fIs\fR);
+.fi
+
+.LP
+.nf
 \fBstruct ether_addr *\fR\fBether_aton\fR(\fBconst char *\fR\fIs\fR);
 .fi
 
 .LP
 .nf
+\fBstruct ether_addr *\fR\fBether_aton_r\fR(\fBconst char *\fR\fIs\fR, \fBstruct ether_addr *\fR\fIe\fR);
+.fi
+
+.LP
+.nf
 \fBint\fR \fBether_ntohost\fR(\fBchar *\fR\fIhostname\fR, \fBconst struct ether_addr *\fR\fIe\fR);
 .fi
 
@@ -55,6 +66,18 @@ representation back to a 48 bit Ethernet number;  the function returns
 \fINULL\fR if the string cannot be scanned successfully.
 .sp
 .LP
+The functions \fBether_ntoa()\fR and \fBether_aton()\fR return values in
+per-thread buffers, one for each function. A second call to one of these
+functions will overwrite the previous value. The functions
+\fBether_ntoa_r()\fR and \fBether_aton_r()\fR behave identically to
+their non-reentrant versions; however, instead of using a per-thread
+buffer, they use caller-supplied buffers. It is the caller's
+responsibility to ensure that the character buffer passed to
+\fBether_ntoa_r()\fR is at least \fBETHERADDRSTRL\fR bytes large -- the
+minimum size to hold the ASCII representation of a 48 bit Ethernet
+number and a \fINULL\fR terminator.
+.sp
+.LP
 The function \fBether_ntohost()\fR maps an Ethernet number (pointed to by
 \fIe\fR) to its associated hostname.  The string pointed to by hostname must be
 long enough to hold the  hostname and a  \fINULL\fR character.  The function