PSARC 2007/282 DLPI MAC-Type Mapping Functions

4714297 libdlpi ought to detect stream hangup properly
6397009 core dumped from get_ethernet_address()
6505649 need DLPI type mapping routines
6524620 dlpi_to_arp belongs in libdlpi, not libdhcputil
6524636 dhcpagent should be ported to libdlpi
6534006 libuuid should be ported to libdlpi
6534017 zoneadm should be ported to libdlpi
6534023 in.rarpd should be ported to libdlpi
6534263 show_linkprop_onelink() should use dlpi_open() instead of open()
6549358 64-bit version of libdladm needed for libuuid
6562226 fsck should link to libraries instead of directly pulling source

--HG--
rename : usr/src/cmd/cmd-inet/sbin/dhcpagent/dlprims.c => deleted_files/usr/src/cmd/cmd-inet/sbin/dhcpagent/dlprims.c
rename : usr/src/cmd/cmd-inet/sbin/dhcpagent/dlprims.h => deleted_files/usr/src/cmd/cmd-inet/sbin/dhcpagent/dlprims.h
rename : usr/src/cmd/zoneadm/dlprims.c => deleted_files/usr/src/cmd/zoneadm/dlprims.c

1 files changed, 4 insertions, 13 deletions

diff --git a/usr/src/cmd/cmd-inet/sbin/dhcpagent/interface.h b/usr/src/cmd/cmd-inet/sbin/dhcpagent/interface.h
index cc00809c8e..585ff7d41e 100644
--- a/usr/src/cmd/cmd-inet/sbin/dhcpagent/interface.h
+++ b/usr/src/cmd/cmd-inet/sbin/dhcpagent/interface.h
@@ -47,6 +47,7 @@ extern "C" {
 #include <netinet/dhcp.h>
 #include <dhcpagent_ipc.h>
 #include <libinetutil.h>
+#include <libdlpi.h>
 
 #include "common.h"
 #include "util.h"
@@ -64,24 +65,14 @@ struct dhcp_pif_s {
 	uchar_t		pif_hwtype;	/* type of link-layer */
 	boolean_t	pif_isv6;
 	boolean_t	pif_running;	/* interface is running */
-	int		pif_dlpi_fd;
+	dlpi_handle_t 	pif_dlpi_hd;	/* dlpi handle */
 	int		pif_dlpi_count;
 	iu_event_id_t	pif_dlpi_id;	/* event id for ack/nak/offer */
 	uint_t		pif_hold_count;	/* reference count */
 
-	/*
-	 * The destination address is the broadcast address of the interface,
-	 * in DLPI terms (which means it includes both a link-layer broadcast
-	 * address and a SAP, and the order depends on the requirements of the
-	 * underlying driver).  We store it as a token like this because it's
-	 * generally how we need to use it.
-	 */
-
-	uchar_t		*pif_daddr;	/* our destination address */
-	uchar_t		pif_dlen;	/* our destination address len */
+	uchar_t		*pif_daddr;	/* our L2 destination address */
+	uchar_t		pif_dlen;	/* our L2 destination address len */
 
-	uint_t		pif_saplen;	/* the SAP len */
-	boolean_t	pif_sap_before;	/* does SAP come before address? */
 	char		pif_name[LIFNAMSIZ];
 };