OS-406
OS-249

*** 19,28 ****
--- 19,29 ----
   * CDDL HEADER END
   */
  /*
   * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
+  * Copyright 2011 Joyent, Inc.  All rights reserved.
   */
  
  #ifndef _SYS_DLD_H
  #define _SYS_DLD_H
  
*** 189,198 ****
--- 190,200 ----
  #define DLDIOC_RENAME           DLDIOC(0x11)
  typedef struct dld_ioc_rename {
          datalink_id_t   dir_linkid1;
          datalink_id_t   dir_linkid2;
          char            dir_link[MAXLINKNAMELEN];
+         boolean_t       dir_zoneinit;
  } dld_ioc_rename_t;
  
  /*
   * The following constants have been removed, and the slots are open:
   *
*** 201,210 ****
--- 203,213 ----
   */
  
  typedef struct dld_ioc_zid {
          zoneid_t        diz_zid;
          datalink_id_t   diz_linkid;
+         boolean_t       diz_transient;
  } dld_ioc_zid_t;
  
  /*
   * data-link autopush configuration.
   */