PSARC/2006/499 Clearview Nemo unification and vanity naming

PSARC/2007/527 Addendum for Clearview Vanity Naming and Nemo Unification
PSARC/2008/002 Clearview UV Updates
6310766 vlan statistics get reset at unplumb time
6320515 dladm commands with "-R" option should not take effect immediately
6433732 Simplify the GLDv3 control path by making its processing asynchronous
6445912 dladm show-link fails to show a specific link in the debug version
6452413 dladm show-link doesn't show VLAN links for GLDv2 drivers
6504433 libwladm's use of wladm_wlresult2status() needs an overhaul
6504507 dladm set-linkprop failure message is unclear
6534289 DR should work with aggregations
6535719 dladm_aggr_port_attr_db_t`lp_devname should be MAXNAMELEN, not MAXNAMELEN + 1
6539634 GLDv3 should DL_ERROR_ACK a DL_UDQOS_REQ with DL_OUTSTATE when the stream is DL_UNATTACHED
6540246 libdladm should not guess zoneid from DLDIOCZIDGET ioctl errno
6544195 dladm show-dev assumes GLDv3 stats.. incompatible with GLDv2
6563295 dladm show-linkprop -P does not work properly for unavailable links
6577618 integrate network vanity naming and nemo unification
6600446 links assigned to a local zone are still aggregatable by global zone
6607572 "boot net - install" can trigger assertion failure in dld_str_attach()
6613956 "svccfg import -" does not work as bfu expects
6637596 invalid assertion in ip_soft_ring_assignment()
6642350 kernel DLPI processing routines are long overdue
6643338 GLDv3 PPA hack VLAN ID checks don't always work
6647203 bfu: smf_delete_manifest() does not work for non-global zones
6649885 DL_IB GLDv3 mactype plugin must fill in its mtr_nativetype
6650395 libuuid should be lint-clean and linted nightly

--HG--
rename : usr/src/cmd/dladm/aggregation.conf => deleted_files/usr/src/cmd/dladm/aggregation.conf
rename : usr/src/cmd/dladm/linkprop.conf => deleted_files/usr/src/cmd/dladm/linkprop.conf
rename : usr/src/lib/libinetcfg/common/inetcfg_nic.c => deleted_files/usr/src/lib/libinetcfg/common/inetcfg_nic.c
rename : usr/src/lib/libinetcfg/common/inetcfg_nic.h => deleted_files/usr/src/lib/libinetcfg/common/inetcfg_nic.h

1 files changed, 22 insertions, 1 deletions

diff --git a/usr/src/uts/common/sys/dlpi.h b/usr/src/uts/common/sys/dlpi.h
index 1d1451c082..355280f920 100644
--- a/usr/src/uts/common/sys/dlpi.h
+++ b/usr/src/uts/common/sys/dlpi.h
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -50,6 +50,7 @@ extern "C" {
 #define	DLIOC		('D' << 8)
 #define	DLIOCRAW	(DLIOC|1)	/* M_DATA "raw" mode */
 #define	DLIOCNATIVE	(DLIOC|2)	/* Native traffic mode */
+#define	DLIOCMARGININFO	(DLIOC|3)	/* margin size info */
 #define	DLIOCHDRINFO	(DLIOC|10)	/* IP fast-path */
 
 #define	DL_IOC_HDR_INFO	DLIOCHDRINFO
@@ -1663,6 +1664,26 @@ extern void	dlphysaddrack(queue_t *, mblk_t *, void *, t_uscalar_t);
 extern void	dlcapabsetqid(dl_mid_t *, const queue_t *);
 extern boolean_t dlcapabcheckqid(const dl_mid_t *, const queue_t *);
 extern void	dlnotifyack(queue_t *, mblk_t *, uint32_t);
+
+/*
+ * The ldi_handle_t typedef is in <sys/sunldi.h>, which in turn requires
+ * <sys/sunddi.h>, which pulls in <sys/cmn_err.h>, which declares kernel
+ * versions of the printf() functions that conflict with the libc ones.
+ * This causes conflicts when building MDB modules like ARP that #define
+ * _KERNEL.  So we use `struct __ldi_handle *' instead.
+ */
+struct __ldi_handle;
+extern int dl_attach(struct __ldi_handle *, int, dl_error_ack_t *);
+extern int dl_bind(struct __ldi_handle *, uint_t, dl_error_ack_t *);
+extern int dl_phys_addr(struct __ldi_handle *, uchar_t *, size_t *,
+    dl_error_ack_t *);
+extern int dl_info(struct __ldi_handle *, dl_info_ack_t *, uchar_t *, size_t *,
+    dl_error_ack_t *);
+extern int dl_notify(struct __ldi_handle *, uint32_t *, dl_error_ack_t *);
+extern const char *dl_errstr(t_uscalar_t);
+extern const char *dl_primstr(t_uscalar_t);
+extern const char *dl_mactypestr(t_uscalar_t);
+
 #endif	/* _KERNEL */
 
 #ifdef	__cplusplus