--- ieee802.3.5.orig	Sun Sep 23 12:12:22 2007
+++ ieee802.3.5	Sun Sep 23 12:13:20 2007
@@ -8,18 +8,18 @@
 NAME
      ieee802.3,    cap_autoneg,     cap_1000fdx,     cap_1000hdx,
      cap_100fdx, cap_100hdx, cap_10fdx, cap_10hdx, cap_rem_fault,
-     cap_pause, cap_asmpause,  adv_cap_autoneg,  adv_cap_1000fdx,
+     cap_pause, cap_asym_pause,  adv_cap_autoneg,  adv_cap_1000fdx,
      adv_cap_1000hdx,       adv_cap_100fdx,       adv_cap_100hdx,
      adv_cap_10fdx,         adv_cap_10hdx,         adv_cap_pause,
-     adv_cap_asmpause,       adv_rem_fault,       lp_cap_autoneg,
+     adv_cap_asym_pause,       adv_rem_fault,       lp_cap_autoneg,
      lp_cap_1000fdx,        lp_cap_1000hdx,        lp_cap_100fdx,
      lp_cap_100hdx,   lp_cap_10fdx,  lp_cap_10hdx,  lp_cap_pause,
-     lp_cap_asmpause,    lp_rem_fault,    xcvr_addr,     xcvr_id,
-     xcvr_inuse,  link_up, link_duplex, link_pause, link_asmpause
-     - Ethernet mii kstat and ndd parameters
+     lp_cap_asym_pause,    lp_rem_fault,    xcvr_addr,     xcvr_id,
+     xcvr_inuse,  link_up, link_duplex, link_tx_pause, link_rx_pause
+     - Ethernet mii kstat and dladm parameters
 
 DESCRIPTION
-     This page describes the kernel statistics  and  the  ndd(1M)
+     This page describes the kernel statistics  and  the  dladm(1M)
      configuration  parameters  used to monitor and configure the
      Ethernet physical layer.
 
@@ -29,7 +29,7 @@
      device  has  the  capability described. When the value is 0,
      the device does not have the capability.
 
-     The  exceptions  to  this  rule  are  the  cap_asmpause  and
+     The  exceptions  to  this  rule  are  the  cap_asym_pause  and
      cap_pause parameters which are explained later in the page.
 
      cap_autoneg      Capable of auto-negotiation
@@ -72,13 +72,13 @@
 
 
      The adv_cap_* parameters exist in the kernel statistics  and
-     represent a mirror image of the ndd adv_*_cap parameter list
-     for an Ethernet device. The ndd adv_*_cap tuning  parameters
+     represent a mirror image of the dladm adv_*_cap parameter list
+     for an Ethernet device. The dladm adv_*_cap tuning  parameters
      allow  fine  grain  control  of the Ethernet device physical
      layer. The parameters are also a subset of the cap_* statis-
      tics.  If  the cap_* value is 0, the corresponding adv_cap_*
      must also  be  0.  The  exceptions  to  this  rule  are  the
-     adv_cap_asmpause and adv_cap_pause parameters.
+     adv_cap_asym_pause and adv_cap_pause parameters.
 
      When auto-negotiation is enabled, the  adv_*_cap  statistics
      show  which capabilities are advertised to the link partner.
@@ -108,7 +108,7 @@
      adv_cap_10fdx      Advertise 10 full duplex capability
 
 
-     adv_cap_10hdxv     Advertise 10 half duplex capability
+     adv_cap_10hdx      Advertise 10 half duplex capability
 
 
      adv_rem_fault      Fault value reported by the local  system
@@ -117,15 +117,12 @@
                         0    Link is good
 
 
-                        1    Off line
+                        1    fault
 
 
-                        2    Link failure
 
 
 
-
-
 SunOS 5.11          Last change: 13 Sep 2004                    2
 
 
@@ -137,10 +134,8 @@
 
 
 
-                        3    Auto-negotiation failure
 
 
-
      The lp_cap_* parameters exist as kernel  statistics  for  an
      Ethernet device. The statistics are the advertised capabili-
      ties provided by the link partner  on  completion  of  auto-
@@ -183,15 +178,13 @@
                        0    Link is good
 
 
-                       1    Off line
+                       1    fault detected
 
 
-                       2    Link failure
 
 
 
 
-
 SunOS 5.11          Last change: 13 Sep 2004                    3
 
 
@@ -203,10 +196,8 @@
 
 
 
-                       3    Auto-negotiation failure
 
 
-
      The xcvr_* kernel statistics provide information  about  the
      physical layer device that is in use.
 
@@ -276,50 +267,30 @@
                             0        Unknown
 
 
-     The   cap_asmpause,   cap_pause,    adv_cap_asmpause,    and
+     The   cap_asym_pause,   cap_pause,    adv_cap_asym_pause,    and
      adv_cap_pause  parameters  do  not follow the rules of other
-     cap_* and adv_cap_* kstats or parameters.
+     cap_* and adv_cap_* kstats or parameters. The cap_*pause 
+     kstats provide information about the capabilities supported 
+     by the device and constrain the values that may be set to the
+     corresponding adv_cap_*pause parameters.
 
-     cap_pause       The meaning of this statistic depends on the
-                     value provided by cap_asmpause.
+     cap_pause       symmetric pause capability.
 
-                     if cap_asmpause = 1, pause one direction
+     cap_asym_pause    Asymmetric pause capability
 
-                     1    Send pause frames when there is receive
-                          congestion.
 
-
-                     0    Pause transmission when a  pause  frame
-                          is received.
-
-                     if cap_asmpause = 0, pause in either  direc-
-                     tion
-
-                     1    Send pause frames when there is receive
-                          congestion, and pause transmission when
-                          a pause frame is received.
-
-
-                     0    Pause capability is  not  available  in
-                          either direction.
-
-
-
-     cap_asmpause    Asymmetric pause capability
-
-
-     The adv_cap_pause and adv_cap_asmpause statistics  are  lim-
+     The adv_cap_pause and adv_cap_asym_pause statistics  are  lim-
      ited   by   the   available   settings   for  cap_pause  and
-     cap_asmpause. For a device that is fully capable of  pausing
-     both Rx (receive) and Tx (transmit) operations, the settings
-     available are defined in the truth table  that  follows  the
-     adv_cap_pause  and  adv_cap_asmpause  parameter descriptions
-     below.
+     cap_asym_pause. These statistics are read-only values whose 
+     setting may be administratively controlled by setting the flowctrl 
+     property supported by  dladm(1M).  For a device that is fully
+     capable of  pausing both Rx (receive) and Tx (transmit)
+     operations, the settings available are defined in the truth table
+     that  follows  the adv_cap_pause  and  adv_cap_asym_pause
+     parameter descriptions below.
 
-     adv_cap_pause       The meaning of this statistic depends on
-                         the value provided by adv_cap_asmpause.
+     adv_cap_pause       When adv_cap_pause is 1, the device can
 
-                         if adv_cap_asmpause = 1
 
 
 
@@ -334,44 +305,41 @@
 Standards, Environments, and Macros                  ieee802.3(5)
 
 
+                         both assert and respond to flow control. 
+			 This is the pre-Gigabit, symmetric mode
+			 of operation, and implies a full (both send
+			 and receive) implementation of the  PAUSE
+			 mechanism within the device. In addition, if 
+			 adv_cap_asym_pause is 1, the device can operate 
+			 either symmetrically or asymmetrically in either
+			 direction.
 
-                         1    Send pause  frames  when  there  is
-                              receive congestion.
+			 If adv_cap_pause is 0, advertised flow-control 
+			 behavior is determined by adv_cap_asym_pause.
+			 If the value of adv_cap_asym_pause is 1, the device
+			 can assert flow control, but cannot resond. 
 
+			 No flow control is available when both
+			 adv_cap_pause  and adv_cap_asym_pause are 0.
 
-                         0    Pause  transmission  when  a  pause
-                              frame is received.
 
-                         if adv_cap_asmpause = 0
+     adv_cap_asym_pause    Asymmetric pause capability
 
-                         1    Send pause  frames  when  there  is
-                              receive   congestion,   and   pause
-                              transmission when a pause frame  is
-                              received.
 
-
-                         0    Pause capability is  not  available
-                              in either direction.
-
-
-
-     adv_cap_asmpause    Asymmetric pause capability
-
-
-     The cap_asmpause and cap_pause statistics show the  capabil-
+     The cap_asym_pause and cap_pause statistics show the  capabil-
      ity  of  a  device  and  also  limit  the  legal setting for
-     adv_cap_asmpause  and  adv_cap_pause.  The  following  truth
-     table   describes   the   available   adv_cap_asmpause   and
-     adv_cap_pause settings limited by cap_asmpause and cap_pause
+     adv_cap_asym_pause  and  adv_cap_pause.  The  following  truth
+     table   describes   the   available   adv_cap_asym_pause   and
+     adv_cap_pause settings limited by cap_asym_pause and cap_pause
      statistics. The abbreviations below are used in the table.
 
-     CA    cap_asmpause
+     CA    cap_asym_pause
 
 
      CP    cap_pause
 
 
-     AA    adv_cap_asmpause
+     AA    adv_cap_asym_pause
 
 
      AP    adv_cap_pause
@@ -401,28 +369,27 @@
 
 
 
-     0      1       1       0        Asymmetric Rx pause capable,  making
-                                     it  impossible  advertise  symmetric
-                                     pause
-     0      1       1       1        Asymmetric Rx pause capable,  making
-                                     it  impossible  advertise asymmetric
-                                     Tx pause
+     0      1       1       0        Asymmetric Rx pause capable, but not
+                                     advertised. Not capable of symmetric
+				     pause.
+     0      1       1       1        Asymmetric Rx pause capable and
+				     advertised. No symmetric pause
+				     capability or asymmetric Tx pause.
      1      0       0       0        Symmetric  pause  capable,  but  not
-                                     advertised
+                                     advertised.
      1      0       0       1        Symmetric pause capable, advertising
                                      asymmetric Rx pause only
      1      0       1       0        Symmetric pause capable, advertising
                                      symmetric Rx and Tx pause capability
-     1      0       1       1        Symmetric pause capable, advertising
-                                     asymmetric Tx pause only
-     1      1       0       0        Asymmetric Tx pause capable, but not
-                                     advertised
-     1      1       0       1        Asymmetric Tx pause capable,  making
-                                     it  impossible  to  advertise  Asym-
-                                     metric Rx pause
-     1      1       1       0        Asymmetric Tx pause capable,  making
-                                     it  impossible  advertise  symmetric
-                                     pause
+     1      0       1       1        Symmetric pause capable and advertised
+     1      1       0       0        symmetric and asymmetric pause capable, 
+				     but not advertised
+     1      1       0       1        symmetric and asymmetric Tx pause
+				     capable; only asymmetric Tx pause
+				     advertised.
+     1      1       1       0        symmetric and symmetric Tx pause
+                                     capable; only symmetric 
+                                     pause advertised.
      1      1       1       1        Asymmetric  Tx  pause  capable   and
                                      advertised
 
@@ -431,92 +398,51 @@
      cannot  advertise.   A  new  setting  is  ignored and values
      revert to the previous setting.
 
-     The lp_cap_pause and the lp_cap_asmpause provide the  adver-
+     The lp_cap_pause and the lp_cap_asym_pause provide the  adver-
      tised capabilities of the link partners.
 
-     lp_cap_pause       The meaning of this statistic depends  on
-                        the value provided by lp_cap_asmpause.
 
-                        if lp_cap_asmpause = 1
 
-                        1    Send  pause  frames  when  there  is
-                             receive congestion.
 
+     lp_cap_pause        When lp_cap_pause is 1, the link-partner can
+			 both assert and respond to flow control.
+			 This is the pre-Gigabit, symmetric mode
+			 of operation, and implies a full (both send
+			 and receive) implementation of the  PAUSE
+			 mechanism within the device. In addition, if 
+			 lp_cap_asym_pause is 1, the link-partner can operate 
+			 either symmetrically or asymmetrically in either
+			 direction.
 
-                        0    Pause  transmission  when  a   pause
-                             frame is received.
+			 If lp_cap_pause is 0, the flow-control 
+			 behavior supported by the link-partner is
+			 determined by lp_cap_asym_pause.
+			 If the value of lp_cap_asym_pause is 1, the 
+			 link-partner can assert flow control, but
+			 cannot resond to any pause-frames sent to it.
 
-                        if lp_cap_asmpause = 0
+			 No flow control is available when both
+			 lp_cap_pause  and lp_cap_asym_pause are 0.
 
-                        1    Send  pause  frames  when  there  is
-                             receive    congestion,   and   pause
-                             transmission when a pause  frame  is
-                             received.
 
+     lp_cap_asym_pause    Asymmetric pause capability
 
 
-
-SunOS 5.11          Last change: 13 Sep 2004                    7
-
-
-
-
-
-
-Standards, Environments, and Macros                  ieee802.3(5)
-
-
-
-                        0    Pause capability is not available in
-                             either direction.
-
-
-
-     lp_cap_asmpause    Asymmetric pause capability
-
-
      When adv_*pause_cap and lp_*pause_cap are compared  on  com-
      pletion of auto-negotiation, the chosen flow control mechan-
      ism for the link depends on what is most meaningful.
 
-     link_asmpause      1 indicates flow control  in  one  direc-
-                        tion.
+     link_tx_pause	 the link partner can assert flow control
+			 by sending pause frames when congestion is
+			 experienced.
+     link_rx_pause	 the link partner can  respond to 
+			 pause frames  received.
 
-                        0 indicates flow control in  both  direc-
-                        tions when link_pause is set to one.
-
-
-     link_pause         if link_asmpause = 0
-
-                        1    Flow  control  in  both  Rx  and  Tx
-                             directions is available.
-
-
-                        0    No flow  control  available  on  the
-                             link.
-
-                        if link_asmpause = 1
-
-                        1    The   local   station   will   honor
-                             received pause frames by temporarily
-                             suspending   transmit   of   further
-                             frames.
-
-
-                        0    In the event of receive  congestion,
-                             the  local  station  will transmit a
-                             pause frame to the peer.
-
-
-
-     lp_cap_asmpause    Asymmetric pause capability
-
-
      The following truth table illustrates  the  meaningful  flow
      control  combinations related to local and link partner con-
      figurations.  The abbreviations below are used in the table.
 
-     AA     adv_cap_asmpause
+     AA     adv_cap_asym_pause
 
 
 
@@ -536,13 +462,13 @@
      AP     adv_cap_pause
 
 
-     LAC    lp_cap_asmpause
+     LAC    lp_cap_asym_pause
 
 
      LPC    lp_cap_pause
 
 
-     LA     link_asmpause
+     LA     link_asym_pause
 
 
      LP     link_pause
@@ -563,16 +489,16 @@
 
 
      When  forced  mode  is  enabled,  the  current  setting   of
-     adv_cap_asmpause  and  adv_cap_pause  are used for the link.
-     The link_asmpause and link_pause become equal to the current
-     adv_cap_asmpause and adv_cap_pause settings. The above table
+     adv_cap_asym_pause  and  adv_cap_pause  are used for the link.
+     The link_asym_pause and link_pause become equal to the current
+     adv_cap_asym_pause and adv_cap_pause settings. The above table
      also applies in forced mode, but the link partner configura-
      tion  must be checked to verify that flow control is operat-
      ing on the link.
 
 SEE ALSO
-     ndd(1M), driver.conf(4), bge(7D), ce(7D), dlpi(7P), eri(7D),
-     ge(7D), gld(7D), hme(7D), qfe(7D)
+     dladm (1M), driver.conf(4), bge(7D), ce(7D), dlpi(7P),
+     eri(7D), ge(7D), gld(7D), hme(7D), qfe(7D)
 
 NOTES
      When adv_cap_autoneg is set to 0, the highest priority speed
