6467580 remove useless #pragma weak from bge/nge driver snv code onnv_48
authorgs150176
Tue, 05 Sep 2006 21:38:41 -0700
changeset 2681 866c35177aa4
parent 2680 dee519130b03
child 2682 cbd74d9c6a01
6467580 remove useless #pragma weak from bge/nge driver snv code
usr/src/uts/common/io/bge/bge_impl.h
usr/src/uts/common/io/bge/bge_main2.c
--- a/usr/src/uts/common/io/bge/bge_impl.h	Tue Sep 05 20:50:36 2006 -0700
+++ b/usr/src/uts/common/io/bge/bge_impl.h	Tue Sep 05 21:38:41 2006 -0700
@@ -92,15 +92,9 @@
 
 /*
  * Reconfiguring the network devices requires the net_config privilege
- * in Solaris 10+.  Prior to this, root privilege is required.  In order
- * that the driver binary can run on both S10+ and earlier versions, we
- * make the decision as to which to use at runtime.  These declarations
- * allow for either (or both) to exist ...
+ * in Solaris 10+.
  */
 extern int secpolicy_net_config(const cred_t *, boolean_t);
-extern int drv_priv(cred_t *);
-#pragma	weak	secpolicy_net_config
-#pragma	weak	drv_priv
 
 #include <sys/netlb.h>			/* originally from cassini	*/
 #include <sys/miiregs.h>		/* by fjlite out of intel 	*/
--- a/usr/src/uts/common/io/bge/bge_main2.c	Tue Sep 05 20:50:36 2006 -0700
+++ b/usr/src/uts/common/io/bge/bge_main2.c	Tue Sep 05 21:38:41 2006 -0700
@@ -1156,12 +1156,8 @@
 	if (need_privilege) {
 		/*
 		 * Check for specific net_config privilege on Solaris 10+.
-		 * Otherwise just check for root access ...
 		 */
-		if (secpolicy_net_config != NULL)
-			err = secpolicy_net_config(iocp->ioc_cr, B_FALSE);
-		else
-			err = drv_priv(iocp->ioc_cr);
+		err = secpolicy_net_config(iocp->ioc_cr, B_FALSE);
 		if (err != 0) {
 			miocnak(wq, mp, 0, err);
 			return;