Print this page
OS-406
OS-249

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/sys/dld.h
          +++ new/usr/src/uts/common/sys/dld.h
↓ open down ↓ 13 lines elided ↑ open up ↑
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  23   23   * Use is subject to license terms.
       24 + * Copyright 2011 Joyent, Inc.  All rights reserved.
  24   25   */
  25   26  
  26   27  #ifndef _SYS_DLD_H
  27   28  #define _SYS_DLD_H
  28   29  
  29   30  /*
  30   31   * Data-Link Driver ioctl interfaces.
  31   32   *
  32   33   * Note that the datastructures defined here define an ioctl interface
  33   34   * that is shared betwen user and kernel space.  The dld driver thus
↓ open down ↓ 150 lines elided ↑ open up ↑
 184  185  #define DLDIOC_DOORSERVER       DLDIOC(0x10)
 185  186  typedef struct dld_ioc_door {
 186  187          boolean_t       did_start_door;
 187  188  } dld_ioc_door_t;
 188  189  
 189  190  #define DLDIOC_RENAME           DLDIOC(0x11)
 190  191  typedef struct dld_ioc_rename {
 191  192          datalink_id_t   dir_linkid1;
 192  193          datalink_id_t   dir_linkid2;
 193  194          char            dir_link[MAXLINKNAMELEN];
      195 +        boolean_t       dir_zoneinit;
 194  196  } dld_ioc_rename_t;
 195  197  
 196  198  /*
 197  199   * The following constants have been removed, and the slots are open:
 198  200   *
 199  201   * #define DLDIOC_SETZID        DLDIOC(0x12)
 200  202   * #define DLDIOC_GETZID        DLDIOC(0x13)
 201  203   */
 202  204  
 203  205  typedef struct dld_ioc_zid {
 204  206          zoneid_t        diz_zid;
 205  207          datalink_id_t   diz_linkid;
      208 +        boolean_t       diz_transient;
 206  209  } dld_ioc_zid_t;
 207  210  
 208  211  /*
 209  212   * data-link autopush configuration.
 210  213   */
 211  214  struct dlautopush {
 212  215          uint_t  dap_anchor;
 213  216          uint_t  dap_npush;
 214  217          char    dap_aplist[MAXAPUSH][FMNAMESZ+1];
 215  218  };
↓ open down ↓ 218 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX