OS-406
OS-249

@@ -19,10 +19,11 @@
  * CDDL HEADER END
  */
 /*
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ * Copyright 2011 Joyent, Inc.  All rights reserved.
  */
 
 #ifndef _SYS_DLS_H
 #define _SYS_DLS_H
 

@@ -108,11 +109,11 @@
                             dls_dl_handle_t *, dev_t *);
 extern void             dls_devnet_close(dls_dl_handle_t);
 extern boolean_t        dls_devnet_rebuild();
 
 extern int              dls_devnet_rename(datalink_id_t, datalink_id_t,
-                            const char *);
+                            const char *, boolean_t);
 extern int              dls_devnet_create(mac_handle_t, datalink_id_t,
                             zoneid_t);
 extern int              dls_devnet_destroy(mac_handle_t, datalink_id_t *,
                             boolean_t);
 extern int              dls_devnet_recreate(mac_handle_t, datalink_id_t);

@@ -125,11 +126,11 @@
 extern const char       *dls_devnet_mac(dls_dl_handle_t);
 extern uint16_t         dls_devnet_vid(dls_dl_handle_t);
 extern datalink_id_t    dls_devnet_linkid(dls_dl_handle_t);
 extern int              dls_devnet_dev2linkid(dev_t, datalink_id_t *);
 extern int              dls_devnet_phydev(datalink_id_t, dev_t *);
-extern int              dls_devnet_setzid(dls_dl_handle_t, zoneid_t);
+extern int              dls_devnet_setzid(dls_dl_handle_t, zoneid_t, boolean_t);
 extern zoneid_t         dls_devnet_getzid(dls_dl_handle_t);
 extern zoneid_t         dls_devnet_getownerzid(dls_dl_handle_t);
 extern boolean_t        dls_devnet_islinkvisible(datalink_id_t, zoneid_t);
 
 extern int              dls_mgmt_door_set(boolean_t);