*** /tmp/dladm.1m.orig.txt	Thu Feb 25 14:39:19 2010
--- /tmp/dladm.1m.new.txt1	Thu Feb 25 15:20:19 2010
***************
*** 1,6 ****
  
  
- 
  System Administration Commands                          dladm(1M)
  
  
--- 1,5 ----
***************
*** 209,219 ****
       dladm show-link [-P] [-s [-i interval]] [[-p] -o
       field[,...]][link]
  
!          Show link configuration  information  (the  default)  or
!          statistics,  either  for all datalinks or for the speci-
!          fied link link. By default,  the  system  is  configured
!          with one datalink for each known network device.
  
           -o field[,...], --output=field[,...]
  
               A case-insensitive, comma-separated list  of  output
--- 208,220 ----
       dladm show-link [-P] [-s [-i interval]] [[-p] -o
       field[,...]][link]
  
!          Show link configuration  information either for all 
!          datalinks or for the specified link. By default, the
!          system  is  configured with one datalink for each
!          known network device. The option to print link statistics
!          is moved to dlstat(1M) show-link.
  
+ 
           -o field[,...], --output=field[,...]
  
               A case-insensitive, comma-separated list  of  output
***************
*** 364,371 ****
  
  
           -s, --statistics
  
!              Display link statistics.
  
  
           -i interval, --interval=interval
--- 365,374 ----
  
  
           -s, --statistics
+ 	
+ 	     Display link statistics.
  
!              This option is made Obsolete by dlstat(1M).
  
  
           -i interval, --interval=interval
***************
*** 375,382 ****
--- 378,387 ----
               this option is not  specified,  statistics  will  be
               displayed only once.
  
+              This option is made Obsolete by dlstat(1M).
  
  
+ 
       dladm rename-link [-R root-dir] link new-link]
  
           Rename link to new-link. This is used to give a  link  a
***************
*** 414,420 ****
           tion.
  
  
!      dladm show-phys [-P] [[-p] -o field[,...]] [phys-link]
  
           Show the physical device and attributes of all  physical
           links,  or  of the named physical link. Without -P, only
--- 419,425 ----
           tion.
  
  
!      dladm show-phys [-P] [[-p] -o field[,...]] [-H] [phys-link]
  
           Show the physical device and attributes of all  physical
           links,  or  of the named physical link. Without -P, only
***************
*** 498,505 ****
--- 503,530 ----
               removed.  For such links, delete-phys can be used to
               purge the link's configuration from the system.
  
+          -H
  
+              Show hardware resource usage, as returned by the NIC driver.
+              Output from -H displays the following elements:
+              
+              LINK
+                  A physical device corresponding to a NIC driver.
+              
+              RINGTYPE
+                  The type of the ring. This is either RX or TX.
+              
+              RINGS
+                  The ring index. A ring is an hardware resource, which
+                  typically maps to a DMA channel, that can be programmed for
+                  specific use. E.g. an RX ring can be programmed to receive
+                  only packets belonging to a specific MAC address.
  
+              CLIENTS
+                  MAC clients using the rings.
+ 
+ 
+ 
       dladm create-aggr [-t] [-R root-dir] [-P policy] [-L mode]
       [-T time] [-u address] -l ether-link1 [-l ether-link2...]
       aggr-link
***************
*** 779,787 ****
       dladm show-aggr [-PLx] [-s [-i interval]] [[-p] -o
       field[,...]] [aggr-link]
  
!          Show  aggregation  configuration  (the  default),   LACP
!          information,  or statistics, either for all aggregations
!          or for the specified aggregation.
  
  
  
--- 804,812 ----
       dladm show-aggr [-PLx] [-s [-i interval]] [[-p] -o
       field[,...]] [aggr-link]
  
!          Show  aggregation  configuration  (the  default) or LACP
!          information either for all aggregations or for the
!          specified aggregation.
  
  
  
***************
*** 1018,1026 ****
  
           -s, --statistics
  
!              Displays aggregation statistics.
  
  
           -i interval, --interval=interval
  
               Used with the -s option to specify an  interval,  in
--- 1043,1053 ----
  
           -s, --statistics
  
! 	     Display aggregation statistics. 
  
+              This option is made Obsolete by dlstat(1M).
  
+ 
           -i interval, --interval=interval
  
               Used with the -s option to specify an  interval,  in
***************
*** 1028,1035 ****
--- 1055,1064 ----
               this option is not  specified,  statistics  will  be
               displayed only once.
  
+              This option is made Obsolete by dlstat(1M).
  
  
+ 
       dladm create-vlan [-ft] [-R root-dir] -l ether-link -v vid
       [vlan-link]
  
***************
*** 2120,2128 ****
       dladm show-vnic [-pP] [-s [-i interval]] [-l link] [vnic-
       link]
  
!          Show VNIC configuration  information  (the  default)  or
!          statistics,  for all VNICs, all VNICs on a link, or only
!          the specified vnic-link.
  
           -o field[,...] , --output=field[,...]
  
--- 2149,2156 ----
       dladm show-vnic [-pP] [-s [-i interval]] [-l link] [vnic-
       link]
  
!          Show VNIC configuration  information for all VNICs, all
!          all VNICs on a link, or only the specified vnic-link.
  
           -o field[,...] , --output=field[,...]
  
***************
*** 2197,2205 ****
  
           -s, --statistics
  
!              Displays VNIC statistics.
  
  
           -i interval, --interval=interval
  
               Used with the -s option to specify an  interval,  in
--- 2225,2235 ----
  
           -s, --statistics
  
! 	     Display VNIC statistics.
  
+              This option is made Obsolete by dlstat(1M).
  
+ 
           -i interval, --interval=interval
  
               Used with the -s option to specify an  interval,  in
***************
*** 2207,2213 ****
--- 2237,2245 ----
               this option is not  specified,  statistics  will  be
               displayed only once.
  
+              This option is made Obsolete by dlstat(1M).
  
+ 
           -l link, --link=link
  
               Display information for all VNICs on the named link.
***************
*** 2305,2337 ****
               information. As of this release, gnuplot is the only
               supported format.
  
  
! SunOS 5.11          Last change: 16 Jan 2009                   35
  
  
  
  
  
  
- System Administration Commands                          dladm(1M)
  
  
  
-          -s time, --start=time
-          -e time, --stop=time
  
-              Start and stop times for data display.  Time  is  in
-              the format MM/DD/YYYY,hh:mm:ss.
  
  
-          link
  
!              If specified, display the network usage only for the
!              named link. Otherwise, display network usage for all
!              links.
  
  
- 
    Parseable Output Format
       Many dladm subcommands have an option that  displays  output
       in  a  machine-parseable format. The output format is one or
--- 2337,2370 ----
               information. As of this release, gnuplot is the only
               supported format.
  
+          -s time, --start=time
+          -e time, --stop=time
  
!              Start and stop times for data display.  Time  is  in
!              the format MM/DD/YYYY,hh:mm:ss.
  
  
+          link
  
+              If specified, display the network usage only for the
+              named link. Otherwise, display network usage for all
+              links.
  
  
+          This subcommand is made Obsolete by dlstat(1M) show-link -h
+          subcommand.
  
  
+ SunOS 5.11          Last change: 16 Jan 2009                   35
  
  
  
  
  
  
! System Administration Commands                          dladm(1M)
  
  
    Parseable Output Format
       Many dladm subcommands have an option that  displays  output
       in  a  machine-parseable format. The output format is one or
***************
*** 2411,2417 ****
--- 2444,2468 ----
           processing  of packets is not bound to any specific pro-
           cessor or processor set.
  
+          Specification of the cpus property is not allowed on
+          links with a pool link property.
  
+ 
+      cpus-effective
+ 
+          This read-only property displays the list of cpus
+          used for packet processing on the named data link.
+ 
+          If the cpus property has been set, cpus-effective will
+          be the same.
+ 
+          If the pools property has been set, the effective cpus
+          will be selected from the pool designated by the
+          administrator.
+ 
+          If neither pool or cpus property is set, the system will
+          select the appropriate effective cpus.
+ 
       maxbw
  
           Sets  the  full  duplex  bandwidth  for  the  link.  The
***************
*** 2420,2426 ****
--- 2471,2506 ----
           no  units are specified, the input value will be read as
           Mbps. The default is no bandwidth limit.
  
+      pool
  
+          Bind the processing of packets for a given data link  to
+          a pool of defined  and  administered  by poolcfg(1M) and
+          pooladm(1M). The binding  of  processes is  similar  to
+          what occurs with the cpus link property, except that the list
+          of CPUs  is  not  explicit  and  is instead maintained by
+          the pools facility.
+ 
+          If pools are enabled, and no pool is specified  for  the
+          link, pool_default will be used for packet processing.
+ 
+          For zones with ip-type=exclusive, if a pool is specified
+          through  a pool  zone property or dedicated-cpus alloca-
+          tion, that pool will also be used  for  all  data  links
+          associated with the zone.
+ 
+          Specification of the pool property  is  not  allowed  on
+          links with a cpus link property.
+ 
+      pool-effective
+ 
+          If the pools facility has been enabled, this read-only
+          property for a data link will display the pool that is being
+          used for packet processing. If the administrator has not
+          assigned a pool to a data link, the pool will be pool_default.
+ 
+          If the pools facility is disabled, there is no effective
+          pool and the value will be empty.
+ 
       priority
  
           Sets the relative priority for the link. The  value  can
***************
*** 2427,2433 ****
--- 2507,2565 ----
           be  given as one of the tokens high, medium, or low. The
           default is high.
  
+      rxrings
  
+          Specifies the number of receive rings needed for the MAC client.
+          A value of "sw" means this MAC client does not need any receive
+          ring while a value of "hw" means reserve at least one receive ring
+          for this MAC client. For devices that support specifying the number
+          of rings, a non-0 value means reserve that many receive rings for
+          this MAC client. If this property is not specified the MAC client
+          may get one receive ring, if available, or none.
+ 
+      rxrings-effective
+ 
+          A read-only property that displays the actual number of receive rings
+          assigned to the data link.
+ 
+      rxrings-available
+ 
+          A read-only property that displays the number of rings available on
+          the receive side.
+ 
+ 
+      rxhwclnt-available
+ 
+          A read-only property that displays the number of additional
+          hardware-based MAC clients that can be created on the receive side.
+ 
+ 
+      txrings
+ 
+          Specifies the number of transmit rings needed for the MAC client.
+          A value of "sw" means this MAC client does not need any transmit
+          ring while  a value of "hw" means reserve at least one transmit ring
+          for this MAC client. For devices that support specifying the number
+          of rings, a non-0 value means reserve that many transmit rings for
+          this MAC client. If this property is not specified the MAC client may
+          get one transmit ring, if available, or none.
+ 
+      txrings-effective
+ 
+          A read-only property that displays the actual number of transmit
+          rings assigned to the data link.
+ 
+      txrings-available
+ 
+          A read-only property that displays the number of rings available on
+          the transmit side.
+ 
+      txhwclnt-available
+ 
+          A read-only property that displays the number of additional
+          hardware-based MAC clients that can be created on the transmit side.
+ 
+ 
       zone
  
           Specifies the zone to which the link belongs. This  pro-
***************
*** 2910,2944 ****
  System Administration Commands                          dladm(1M)
  
  
- 
-      Example 17 Show Network Usage
- 
- 
-      Network usage statistics can be stored  using  the  extended
-      accounting facility, acctadm(1M).
- 
- 
-        # acctadm -e basic -f /var/log/net.log net
-        # acctadm net
-                  Network accounting: active
-             Network accounting file: /var/log/net.log
-           Tracked Network resources: basic
-         Untracked Network resources: src_ip,dst_ip,src_port,dst_port,protocol,
-                                      dsfield
- 
- 
- 
- 
-      The saved historical data can be retrieved in  summary  form
-      using the show-usage subcommand:
- 
- 
-        # dladm show-usage -f /var/log/net.log
-        LINK      DURATION  IPACKETS RBYTES      OPACKETS OBYTES      BANDWIDTH
-        e1000g0   80        1031     546908      0        0           2.44 Kbps
- 
- 
- 
  ATTRIBUTES
       See attributes(5) for descriptions of the  following  attri-
       butes:
--- 3042,3047 ----
***************
*** 2953,2959 ****
      |_____________________________|_____________________________|
      | Availability                | SUNWcsu                     |
      |_____________________________|_____________________________|
!     | Interface Stability         | Committed                   |
      |_____________________________|_____________________________|
  
  
--- 3056,3062 ----
      |_____________________________|_____________________________|
      | Availability                | SUNWcsu                     |
      |_____________________________|_____________________________|
!     | Interface Stability         | Committed*                  |
      |_____________________________|_____________________________|
  
  
***************
*** 2982,2995 ****
      |_____________________________|_____________________________|
      | Availability                | SUNWcsr                     |
      |_____________________________|_____________________________|
!     | Interface Stability         | Committed                   |
      |_____________________________|_____________________________|
  
  
  SEE ALSO
!      acctadm(1M),    autopush(1M),     ifconfig(1M),     ndd(1M),
!      psrset(1M),     wpad(1M),     zonecfg(1M),    attributes(5),
!      ieee802.3(5), dlpi(7P)
  
  NOTES
       The preferred method of referring to an aggregation  in  the
--- 3085,3100 ----
      |_____________________________|_____________________________|
      | Availability                | SUNWcsr                     |
      |_____________________________|_____________________________|
!     | Interface Stability         | Committed*                  |
      |_____________________________|_____________________________|
  
+ 	* dladm show-link, dladm show-vnic and dladm show-aggr's
+ 	-s and -i are committed obselete.
  
  SEE ALSO
!     acctadm(1M),    autopush(1M),     dlstat(1M), ifconfig(1M),     
!     ndd(1M),	      psrset(1M),     wpad(1M),     zonecfg(1M),  
!     attributes(5), ieee802.3(5), dlpi(7P), poolcfg(1m), pooladm(1m)
  
  NOTES
       The preferred method of referring to an aggregation  in  the
***************
*** 3033,3038 ****
  
  
  SunOS 5.11          Last change: 16 Jan 2009                   46
- 
- 
- 
--- 3138,3140 ----
