6795822 dld.h and mac.h pollute user space code with kernel symbols

7 files changed, 18 insertions, 17 deletions

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