--- dladm.1m.orig	Thu Sep 20 15:45:09 2007
+++ dladm.1m	Sun Sep 23 12:10:12 2007
@@ -10,7 +10,7 @@
 
 SYNOPSIS
      dladm show-link [-p] [-s [-i interval]] [name]
-     dladm show-dev [-p] [-s [-i interval]] [dev]
+     dladm show-dev [-p] [-s [-i interval]] [-o field,...] [dev]
 
      dladm create-aggr [-t] [-R root-dir] [-P policy] [-l mode]
          [-T time] [-u address] -d dev... key
@@ -29,11 +29,12 @@
 
      dladm set-linkprop [-t] [-R root-dir] -p prop=value[,...] name
      dladm reset-linkprop [-t] [-R root-dir] [-p prop,...] name
-     dladm show-linkprop [-cP] [-p prop,...] [name]
+     dladm show-linkprop [-cP] [-o field,...] [-p prop,...] [name]
+     dladm show-ether [-px] [-o field,...][name]
 
      dladm create-secobj [-t] [-R root-dir] [-f file] -c class secobj
      dladm delete-secobj [-t] [-R root-dir] secobj[,...]
-     dladm show-secobj [-pP] [secobj,...]
+     dladm show-secobj [-pP] [-o field,...] [secobj,...]
 
 
 DESCRIPTION
@@ -113,7 +114,7 @@
 
 
 
-     dladm show-dev [-p] [-s [-i interval]] [dev]
+     dladm show-dev [-p] [-s [-i interval]] [-o field,...] [dev]
 
          Show device configuration information (the  default)  or
          statistics,  either  for  all network devices or for the
@@ -840,7 +841,7 @@
 
 
 
-     dladm show-linkprop [-cP] [-p prop, ...] [name]
+     dladm show-linkprop [-cP] [-o field,...] [-p prop, ...] [name]
 
          Show the current or persistent values  of  one  or  more
          properties,   either  for  all  data-links  or  for  the
@@ -861,7 +862,7 @@
          specified link name.  By  default,  current  values  are
          shown.  If  no  properties  are specified, all available
          link properties are displayed. For  each  property,  the
-         following fields are displayed:
+         following fields can be displayed:
 
          LINK        The name of the data-link.
 
@@ -893,7 +894,7 @@
          property  further  depends  on  the  underlying  network
          hardware  and  its  state.  General  link properties are
          documented in the LINK PROPERTIES section. However, link
-         properties  that  begin  with  "link"  are specific to a
+         properties  that  begin  with  "_"  are specific to a
          given link or its underlying network device and  subject
          to change or removal; see the appropriate network device
          driver manpage for details.
@@ -907,7 +908,13 @@
 
              Display persistent link property information
 
+         -o field,..., --output=field
 
+             A case-insensitive, comma-separated list  of  output
+             fields to display. The field name must be one of the
+             fields listed above, or the special value  "all"  to
+             display all fields.
+
          -p prop, ..., --prop=prop, ...
 
 
@@ -1005,7 +1012,7 @@
 
 
 
-     dladm show-secobj [-pP] [secobj,...]
+     dladm show-secobj [-pP] [-o field,...] [secobj,...]
 
          Show current or persistent secure object information. If
          one  or more secure objects are specified, then informa-
@@ -1094,7 +1101,117 @@
                   1, 2, 11, and 54. By default, there is no fixed
                   speed.
 
+  ETHERNET LINK PROPERTIES
 
+    The following MII Properties as documented in ieee802.3(5)
+    are supported: 
+
+    link_duplex, link_up, adv_autoneg_cap, 
+    adv_1000fdx_cap, adv_1000hdx_cap, adv_100fdx_cap,
+    adv_100hdx_cap, adv_10fdx_cap, adv_10hdx_cap. 
+
+    In addition, the following ethernet properties are reported:
+
+    ifspeed	        (read-only) the operating speed of the 
+		        device in Mbps
+
+    default_mtu    	The maximum client SDU (Send Data Unit) 
+             		supported by the device. Valid range [68-65536]
+
+    link_clock		Applicable to gigabit twisted pair links only.
+			Establishes master/slave when autonegotiation 
+			is disabled. Valid input values: "master", "slave",
+			"auto". 
+
+    flowctrl		Establishes flow-control modes that will be 
+			advertised by the device. Valid input is one of
+			no: no flow control enabled. 
+			rx:  receive, and act upon incoming pause frames
+			tx: transmit pause frames to the peer when congestion
+			    occurs, but ignore received pause frames
+			bi: bidirectional flow control 
+
+			Note that the actual settings for this value
+			are constrained by the capabilities allowed by 
+			the device and the link-partner.
+
+    link_lance_mode, link_ipg{0,1,2}
+			Inter-packet gap settings, typically used to
+			reduce collisions in a CSMA/CD media. Valid
+			input for link_lance_mode is 0 (Disable) or 
+			1 (Enable). Valid input rage for link_ipg{0,1,2} 
+			is [0-65536] 
+
+     dladm show-ether [-p] [-o field,...] [name]
+
+         Shows state information either for all Ethernet
+         links  or  for  the  specified  link name. For each 
+         link, the following fields can be displayed:
+
+         LINK
+
+             The name of the link being displayed.
+
+
+         PTYPE
+
+             Parameter type, where "current" indicates the negotiated
+             state of the link, "capable" indicates capabilities supported
+	     by the device, "adv" indicates the advertised capabilities,
+	     and "peeradv" indicates the capabilities advertised by the 
+	     link-partner.
+
+         STATE
+
+             The state of the link
+
+         AUTO
+
+             yes/no value indicating whether/not autonegotiation is 
+	     advertised
+
+	 SPEED-DUPLEX
+
+	     Permutations of speed and duplex values available. The units
+	     of speed are encoded with a trailing suffix of G (Gigabits/s)
+	     or M (Mb/s). Duplex values are encoded as 'f' (full-duplex)
+	     or 'h' (half-duplex)
+
+          PAUSE
+
+	     Flow control information. May be "" indicating
+	     no flow control is available, "tx" indicating that the
+	     end-point can transmit pause frames, but ignores any received
+	     pause frames, "rx" indicating that the end-point receives
+	     and acts upon received pause frames, or "both" indicating
+	     bi-directional flow-control. 
+
+	  REM_FAULT
+
+	     Fault detection information. Valid values may be "none"
+	     or "fault". 
+
+         By  default,  currently  all  fields except REM_FAULT
+	 are displayed for the "current" PTYPE.
+
+         -p, --parseable
+
+             Displays using a stable machine-parseable format. If
+             this  option  is  specified,  all  output fields are
+             displayed by default.
+
+         -x, --extended
+
+             Extended output is displayed for PTYPE values of "current",
+	     "capable", "adv" and "peeradv"
+
+         -o  field,..., --output=field
+
+             A case-insensitive, comma-separated list  of  output
+             fields to display. The field name must be one of the
+             fields listed above, or the special value  "all"  to
+             display all fields.
+
 EXAMPLES
      Example 1 Configuring an Aggregation
 
@@ -1237,10 +1354,11 @@
 
 SEE ALSO
      ifconfig(1M), zonecfg(1M), wpad(1M), attributes(5), dlpi(7P)
+     ieee802.3(5)
 
+     Sun GigaSwift Ethernet Adapter Installation and User's Guide
 
 
-
 
 
 SunOS 5.11          Last change: 27 Apr 2007                   19
