4 files changed, 24 insertions, 4 deletions
diff --git a/usr/src/uts/common/sys/dlpi.h b/usr/src/uts/common/sys/dlpi.h
index 9613c6491c..72e2c890da 100644
--- a/usr/src/uts/common/sys/dlpi.h
+++ b/usr/src/uts/common/sys/dlpi.h
@@ -19,8 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -407,6 +406,7 @@ typedef struct dl_ipnetinfo {
 #define	DL_NOTE_FASTPATH_FLUSH	0x0200	/* Fast Path info changes */
 #define	DL_NOTE_CAPAB_RENEG	0x0400	/* Initiate capability renegotiation */
 #define	DL_NOTE_REPLUMB		0x0800	/* Inform the link to replumb */
+#define	DL_NOTE_ALLOWED_IPS	0x1000	/* "allowed-ips"  notification */
 
 /*
  * DLPI notification codes for DL_NOTIFY_CONF primitives.
diff --git a/usr/src/uts/common/sys/mac.h b/usr/src/uts/common/sys/mac.h
index 224987e220..7288db385c 100644
--- a/usr/src/uts/common/sys/mac.h
+++ b/usr/src/uts/common/sys/mac.h
@@ -349,6 +349,7 @@ typedef enum {
 	MAC_NOTE_MARGIN,
 	MAC_NOTE_CAPAB_CHG,
 	MAC_NOTE_LOWLINK,
+	MAC_NOTE_ALLOWED_IPS,
 	MAC_NNOTE	/* must be the last entry */
 } mac_notify_type_t;
 
diff --git a/usr/src/uts/common/sys/mac_provider.h b/usr/src/uts/common/sys/mac_provider.h
index c96d07b594..3dd8024904 100644
--- a/usr/src/uts/common/sys/mac_provider.h
+++ b/usr/src/uts/common/sys/mac_provider.h
@@ -20,8 +20,7 @@
  */
 
 /*
- * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #ifndef	_SYS_MAC_PROVIDER_H
@@ -33,6 +32,7 @@
 #include <sys/stream.h>
 #include <sys/mkdev.h>
 #include <sys/mac.h>
+#include <sys/mac_flow.h>
 
 /*
  * MAC Provider Interface
@@ -455,6 +455,7 @@ typedef struct mac_register_s {
 /*
  * Driver interface functions.
  */
+extern void			mac_protect_get(mac_handle_t, mac_protect_t *);
 extern void			mac_sdu_get(mac_handle_t, uint_t *, uint_t *);
 extern int			mac_maxsdu_update(mac_handle_t, uint_t);
 
diff --git a/usr/src/uts/common/sys/zone.h b/usr/src/uts/common/sys/zone.h
index 0a513f8cf7..b89a6902db 100644
--- a/usr/src/uts/common/sys/zone.h
+++ b/usr/src/uts/common/sys/zone.h
@@ -36,6 +36,8 @@
 #include <sys/netstack.h>
 #include <sys/uadmin.h>
 #include <sys/ksynch.h>
+#include <sys/socket_impl.h>
+#include <netinet/in.h>
 
 #ifdef	__cplusplus
 extern "C" {
@@ -97,6 +99,7 @@ extern "C" {
 #define	ZONE_ATTR_FLAGS		14
 #define	ZONE_ATTR_HOSTID	15
 #define	ZONE_ATTR_FS_ALLOWED	16
+#define	ZONE_ATTR_NETWORK	17
 
 /* Start of the brand-specific attribute namespace */
 #define	ZONE_ATTR_BRAND_ATTRS	32768
@@ -279,6 +282,21 @@ typedef struct zone_cmd_rval {
 /* zone_create flags */
 #define	ZCF_NET_EXCL		0x1	/* Create a zone with exclusive IP */
 
+/* zone network properties */
+#define	ZONE_NETWORK_ADDRESS	1
+#define	ZONE_NETWORK_DEFROUTER	2
+
+#define	ZONE_NET_ADDRNAME	"address"
+#define	ZONE_NET_RTRNAME	"route"
+
+typedef struct zone_net_data {
+	int zn_type;
+	int zn_len;
+	datalink_id_t zn_linkid;
+	uint8_t zn_val[1];
+} zone_net_data_t;
+
+
 #ifdef _KERNEL
 /*
  * We need to protect the definition of 'list_t' from userland applications and