summaryrefslogtreecommitdiff
path: root/usr
diff options
context:
space:
mode:
Diffstat (limited to 'usr')
-rw-r--r--usr/src/cmd/dlmgmtd/dlmgmt_impl.h3
-rw-r--r--usr/src/cmd/dlmgmtd/dlmgmt_main.c1
-rw-r--r--usr/src/cmd/dlmgmtd/dlmgmt_util.c1
-rw-r--r--usr/src/lib/Makefile3
-rw-r--r--usr/src/lib/libdladm/common/flowprop.c1
-rw-r--r--usr/src/lib/libdladm/common/libdladm.c1
-rw-r--r--usr/src/lib/libdladm/common/libdlflow.c1
-rw-r--r--usr/src/lib/libdladm/common/libdlmgmt.c3
-rw-r--r--usr/src/lib/libdladm/common/libdlstat.c1
-rw-r--r--usr/src/lib/libdladm/common/secobj.c3
-rw-r--r--usr/src/lib/libdladm/common/usage.c1
-rw-r--r--usr/src/lib/libnwam/common/door.c3
-rw-r--r--usr/src/uts/common/io/dld/dld_drv.c1
-rw-r--r--usr/src/uts/common/io/softmac/softmac_fp.c1
-rw-r--r--usr/src/uts/common/os/exacct.c3
-rw-r--r--usr/src/uts/common/sys/devinfo_impl.h4
-rw-r--r--usr/src/uts/common/sys/dld.h4
-rw-r--r--usr/src/uts/common/sys/mac.h5
-rw-r--r--usr/src/uts/common/sys/net80211_crypto.h17
19 files changed, 35 insertions, 22 deletions
diff --git a/usr/src/cmd/dlmgmtd/dlmgmt_impl.h b/usr/src/cmd/dlmgmtd/dlmgmt_impl.h
index 4bd8f2d2cb..237910ede6 100644
--- a/usr/src/cmd/dlmgmtd/dlmgmt_impl.h
+++ b/usr/src/cmd/dlmgmtd/dlmgmt_impl.h
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -37,6 +37,7 @@ extern "C" {
#include <door.h>
#include <libdllink.h>
+#include <sys/avl.h>
/*
* datalink attribute structure
diff --git a/usr/src/cmd/dlmgmtd/dlmgmt_main.c b/usr/src/cmd/dlmgmtd/dlmgmt_main.c
index 73f6745f87..5a27fdc2c2 100644
--- a/usr/src/cmd/dlmgmtd/dlmgmt_main.c
+++ b/usr/src/cmd/dlmgmtd/dlmgmt_main.c
@@ -48,6 +48,7 @@
#include <strings.h>
#include <syslog.h>
#include <sys/dld.h>
+#include <sys/dld_ioc.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <unistd.h>
diff --git a/usr/src/cmd/dlmgmtd/dlmgmt_util.c b/usr/src/cmd/dlmgmtd/dlmgmt_util.c
index 130a4ef9c5..87d2ed394f 100644
--- a/usr/src/cmd/dlmgmtd/dlmgmt_util.c
+++ b/usr/src/cmd/dlmgmtd/dlmgmt_util.c
@@ -36,6 +36,7 @@
#include <strings.h>
#include <syslog.h>
#include <stdarg.h>
+#include <errno.h>
#include <libdlpi.h>
#include "dlmgmt_impl.h"
diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile
index 4dc4077d5a..03a65a3c85 100644
--- a/usr/src/lib/Makefile
+++ b/usr/src/lib/Makefile
@@ -547,7 +547,8 @@ libdevinfo: libnvpair libsec
libdhcpagent: libsocket libdhcputil libuuid libdlpi
libdhcpsvc: libinetutil
libdhcputil: libnsl libgen libinetutil libdlpi
-libdladm: libdevinfo libinetutil libsocket libnsl libexacct libscf
+libdladm: libdevinfo libinetutil libsocket libscf librcm libnvpair \
+ libexacct libnsl libkstat libcurses
libdll: libast
libdlpi: libinetutil libdladm
libdscfg: libnsctl libunistat libsocket libnsl
diff --git a/usr/src/lib/libdladm/common/flowprop.c b/usr/src/lib/libdladm/common/flowprop.c
index 2b42156c46..067f3a020f 100644
--- a/usr/src/lib/libdladm/common/flowprop.c
+++ b/usr/src/lib/libdladm/common/flowprop.c
@@ -30,6 +30,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/dld.h>
+#include <sys/dld_ioc.h>
#include <fcntl.h>
#include <unistd.h>
#include <libdevinfo.h>
diff --git a/usr/src/lib/libdladm/common/libdladm.c b/usr/src/lib/libdladm/common/libdladm.c
index 15e13fc5da..3607a061ee 100644
--- a/usr/src/lib/libdladm/common/libdladm.c
+++ b/usr/src/lib/libdladm/common/libdladm.c
@@ -33,6 +33,7 @@
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/dld.h>
+#include <sys/dld_ioc.h>
#include <libdladm_impl.h>
#include <libintl.h>
#include <libdlpi.h>
diff --git a/usr/src/lib/libdladm/common/libdlflow.c b/usr/src/lib/libdladm/common/libdlflow.c
index 167af86a92..8d72eac11c 100644
--- a/usr/src/lib/libdladm/common/libdlflow.c
+++ b/usr/src/lib/libdladm/common/libdlflow.c
@@ -30,6 +30,7 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <sys/stat.h>
+#include <sys/dld_ioc.h>
#include <string.h>
#include <fcntl.h>
#include <unistd.h>
diff --git a/usr/src/lib/libdladm/common/libdlmgmt.c b/usr/src/lib/libdladm/common/libdlmgmt.c
index 39140917de..c642567fd5 100644
--- a/usr/src/lib/libdladm/common/libdlmgmt.c
+++ b/usr/src/lib/libdladm/common/libdlmgmt.c
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -34,6 +34,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/aggr.h>
+#include <sys/mman.h>
#include <fcntl.h>
#include <libdladm.h>
#include <libdladm_impl.h>
diff --git a/usr/src/lib/libdladm/common/libdlstat.c b/usr/src/lib/libdladm/common/libdlstat.c
index 222d6e905b..53d4f9cedf 100644
--- a/usr/src/lib/libdladm/common/libdlstat.c
+++ b/usr/src/lib/libdladm/common/libdlstat.c
@@ -32,6 +32,7 @@
#include <unistd.h>
#include <signal.h>
#include <sys/dld.h>
+#include <sys/ddi.h>
#include <libdllink.h>
#include <libdlflow.h>
diff --git a/usr/src/lib/libdladm/common/secobj.c b/usr/src/lib/libdladm/common/secobj.c
index 0f105c8826..07f02ac996 100644
--- a/usr/src/lib/libdladm/common/secobj.c
+++ b/usr/src/lib/libdladm/common/secobj.c
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -31,6 +31,7 @@
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/dld.h>
+#include <sys/dld_ioc.h>
#include <libinetutil.h>
#include <libdllink.h>
#include <libdladm_impl.h>
diff --git a/usr/src/lib/libdladm/common/usage.c b/usr/src/lib/libdladm/common/usage.c
index cc241e6077..b78f3dff7a 100644
--- a/usr/src/lib/libdladm/common/usage.c
+++ b/usr/src/lib/libdladm/common/usage.c
@@ -28,6 +28,7 @@
#include <stdlib.h>
#include <strings.h>
#include <exacct.h>
+#include <net/if.h>
#include <libdladm.h>
#define TIMEBUFLEN 20
diff --git a/usr/src/lib/libnwam/common/door.c b/usr/src/lib/libnwam/common/door.c
index f0c49e21b6..6feaff84d6 100644
--- a/usr/src/lib/libnwam/common/door.c
+++ b/usr/src/lib/libnwam/common/door.c
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -36,6 +36,7 @@
#include <pthread.h>
#include <door.h>
#include <sys/types.h>
+#include <sys/mman.h>
#include <fcntl.h>
#include <errno.h>
#include <string.h>
diff --git a/usr/src/uts/common/io/dld/dld_drv.c b/usr/src/uts/common/io/dld/dld_drv.c
index 57721bb2ed..08ba9ae673 100644
--- a/usr/src/uts/common/io/dld/dld_drv.c
+++ b/usr/src/uts/common/io/dld/dld_drv.c
@@ -32,6 +32,7 @@
#include <sys/modctl.h>
#include <sys/stat.h>
#include <sys/dld_impl.h>
+#include <sys/dld_ioc.h>
#include <sys/dls_impl.h>
#include <sys/softmac.h>
#include <sys/mac.h>
diff --git a/usr/src/uts/common/io/softmac/softmac_fp.c b/usr/src/uts/common/io/softmac/softmac_fp.c
index a012aa32a4..9568de1332 100644
--- a/usr/src/uts/common/io/softmac/softmac_fp.c
+++ b/usr/src/uts/common/io/softmac/softmac_fp.c
@@ -119,6 +119,7 @@
#include <sys/dld.h>
#include <sys/sockio.h>
#include <sys/softmac_impl.h>
+#include <net/if.h>
static kmutex_t softmac_taskq_lock;
static kcondvar_t softmac_taskq_cv;
diff --git a/usr/src/uts/common/os/exacct.c b/usr/src/uts/common/os/exacct.c
index 43a7298c7b..4d9009abf2 100644
--- a/usr/src/uts/common/os/exacct.c
+++ b/usr/src/uts/common/os/exacct.c
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -41,7 +41,6 @@
#include <sys/sysmacros.h>
#include <sys/bitmap.h>
#include <sys/msacct.h>
-#include <sys/mac.h>
/*
* exacct usage and recording routines
diff --git a/usr/src/uts/common/sys/devinfo_impl.h b/usr/src/uts/common/sys/devinfo_impl.h
index bcc4787d48..e64f5fc601 100644
--- a/usr/src/uts/common/sys/devinfo_impl.h
+++ b/usr/src/uts/common/sys/devinfo_impl.h
@@ -19,14 +19,14 @@
* CDDL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
#ifndef _SYS_DEVINFO_IMPL_H
#define _SYS_DEVINFO_IMPL_H
-#pragma ident "%Z%%M% %I% %E% SMI"
+#include <sys/ddi_impldefs.h>
/*
* This file is separate from libdevinfo.h because the devinfo driver
diff --git a/usr/src/uts/common/sys/dld.h b/usr/src/uts/common/sys/dld.h
index 5fede27bb2..9eb076b753 100644
--- a/usr/src/uts/common/sys/dld.h
+++ b/usr/src/uts/common/sys/dld.h
@@ -37,13 +37,9 @@
#include <sys/types.h>
#include <sys/stream.h>
-#include <sys/dld_ioc.h>
#include <sys/mac_flow.h>
#include <sys/conf.h>
#include <sys/sad.h>
-#include <net/if.h>
-#include <sys/ddi.h>
-#include <sys/sunddi.h>
#include <sys/mac.h>
#ifdef __cplusplus
diff --git a/usr/src/uts/common/sys/mac.h b/usr/src/uts/common/sys/mac.h
index 2cfe7443e5..52fd06e47e 100644
--- a/usr/src/uts/common/sys/mac.h
+++ b/usr/src/uts/common/sys/mac.h
@@ -28,10 +28,9 @@
#define _SYS_MAC_H
#include <sys/types.h>
-#include <sys/ddi.h>
+#ifdef _KERNEL
#include <sys/sunddi.h>
-#include <sys/stream.h>
-#include <sys/mac_flow.h>
+#endif
/*
* MAC Services Module
diff --git a/usr/src/uts/common/sys/net80211_crypto.h b/usr/src/uts/common/sys/net80211_crypto.h
index b1c7d149df..72ef3ebec3 100644
--- a/usr/src/uts/common/sys/net80211_crypto.h
+++ b/usr/src/uts/common/sys/net80211_crypto.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -38,10 +38,11 @@
#ifndef _SYS_NET80211_CRYPTO_H
#define _SYS_NET80211_CRYPTO_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <sys/types.h>
+#ifdef _KERNEL
+#include <sys/stream.h>
#include <sys/mac.h>
+#endif
#include <sys/net80211_proto.h>
/*
@@ -127,13 +128,15 @@ extern "C" {
/* Maximum number of keys */
#define IEEE80211_KEY_MAX IEEE80211_WEP_NKID
-struct ieee80211com;
-struct ieee80211_node;
-struct ieee80211_key;
typedef uint16_t ieee80211_keyix; /* h/w key index */
#define IEEE80211_KEYIX_NONE ((ieee80211_keyix) -1)
+#ifdef _KERNEL
+
+struct ieee80211com;
+struct ieee80211_key;
+
/*
* Template for a supported cipher. Ciphers register with the
* crypto code.
@@ -240,6 +243,8 @@ void ieee80211_crypto_unregister(struct ieee80211com *ic,
void ieee80211_crypto_resetkey(struct ieee80211com *, struct ieee80211_key *,
ieee80211_keyix);
+#endif /* _KERNEL */
+
#ifdef __cplusplus
}
#endif
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-03 11:23:12 +0000