Illumos sync

6 files changed, 43 insertions, 9 deletions

diff --git a/usr/src/uts/intel/io/agpmaster/agpmaster.c b/usr/src/uts/intel/io/agpmaster/agpmaster.c
index 9e71b3cf41..7a4de1ea04 100644
--- a/usr/src/uts/intel/io/agpmaster/agpmaster.c
+++ b/usr/src/uts/intel/io/agpmaster/agpmaster.c
@@ -639,7 +639,7 @@ detect_i8xx_device(agp_master_softc_t *master_softc)
 }
 
 /*
- * If agp master is succssfully detected, 0 is returned.
+ * If agp master is successfully detected, 0 is returned.
  * Otherwise -1 is returned.
  */
 static int
diff --git a/usr/src/uts/intel/io/ipmi/THIRDPARTYLICENSE b/usr/src/uts/intel/io/ipmi/THIRDPARTYLICENSE
new file mode 100644
index 0000000000..78c9a1985c
--- /dev/null
+++ b/usr/src/uts/intel/io/ipmi/THIRDPARTYLICENSE
@@ -0,0 +1,23 @@
+Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/usr/src/uts/intel/io/ipmi/THIRDPARTYLICENSE.descrip b/usr/src/uts/intel/io/ipmi/THIRDPARTYLICENSE.descrip
new file mode 100644
index 0000000000..eb678fe823
--- /dev/null
+++ b/usr/src/uts/intel/io/ipmi/THIRDPARTYLICENSE.descrip
@@ -0,0 +1 @@
+INTELLIGENT PLATFORM MANAGEMENT INTERFACE SUPPORT
diff --git a/usr/src/uts/intel/io/ipmi/ipmi.c b/usr/src/uts/intel/io/ipmi/ipmi.c
index 56829dfcad..7c59bc2fda 100644
--- a/usr/src/uts/intel/io/ipmi/ipmi.c
+++ b/usr/src/uts/intel/io/ipmi/ipmi.c
@@ -235,7 +235,8 @@ ipmi_startup(struct ipmi_softc *sc)
 	req = ipmi_alloc_driver_request(IPMI_ADDR(IPMI_APP_REQUEST, 0),
 	    IPMI_CLEAR_FLAGS, 1, 0);
 
-	(void) ipmi_submit_driver_request(sc, req, 0);
+	if ((error = ipmi_submit_driver_request(sc, req, 0)) != 0)
+		cmn_err(CE_WARN, "Failed to clear IPMI flags: %d\n", error);
 
 	/* Magic numbers */
 	if (req->ir_compcode == 0xc0) {
@@ -251,7 +252,10 @@ ipmi_startup(struct ipmi_softc *sc)
 		    IPMI_GET_CHANNEL_INFO, 1, 0);
 		req->ir_request[0] = (uchar_t)i;
 
-		(void) ipmi_submit_driver_request(sc, req, 0);
+		if (ipmi_submit_driver_request(sc, req, 0) != 0) {
+			ipmi_free_request(req);
+			break;
+		}
 
 		if (req->ir_compcode != 0) {
 			ipmi_free_request(req);
@@ -265,7 +269,11 @@ ipmi_startup(struct ipmi_softc *sc)
 	req = ipmi_alloc_driver_request(IPMI_ADDR(IPMI_APP_REQUEST, 0),
 	    IPMI_GET_WDOG, 0, 0);
 
-	(void) ipmi_submit_driver_request(sc, req, 0);
+	if ((error = ipmi_submit_driver_request(sc, req, 0)) != 0) {
+		cmn_err(CE_WARN, "Failed to check IPMI watchdog: %d\n", error);
+		ipmi_free_request(req);
+		return;
+	}
 
 	if (req->ir_compcode == 0x00) {
 		cmn_err(CE_CONT, "!watchdog supported");
diff --git a/usr/src/uts/intel/io/ipmi/ipmi_kcs.c b/usr/src/uts/intel/io/ipmi/ipmi_kcs.c
index 480db14459..2cdeb5c0f7 100644
--- a/usr/src/uts/intel/io/ipmi/ipmi_kcs.c
+++ b/usr/src/uts/intel/io/ipmi/ipmi_kcs.c
@@ -31,6 +31,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/disp.h>
 #include <sys/systm.h>
 #include <sys/condvar.h>
 #include <sys/cmn_err.h>
diff --git a/usr/src/uts/intel/io/ipmi/ipmi_main.c b/usr/src/uts/intel/io/ipmi/ipmi_main.c
index 465cb338a6..9d1e2d0031 100644
--- a/usr/src/uts/intel/io/ipmi/ipmi_main.c
+++ b/usr/src/uts/intel/io/ipmi/ipmi_main.c
@@ -180,21 +180,22 @@ static int
 ipmi_close(dev_t dev, int flag, int otyp, cred_t *cred)
 {
 	ipmi_device_t *dp;
-	struct ipmi_request *req;
+	struct ipmi_request *req, *next;
 
 	if ((dp = lookup_ipmidev_by_dev(dev)) == NULL)
 		return (ENODEV);
 
 	IPMI_LOCK(sc);
 	/* remove any pending requests */
-restart:
-	for (req = TAILQ_FIRST(&sc->ipmi_pending_requests); req != NULL;
-	    req = TAILQ_NEXT(req, ir_link)) {
+	req = TAILQ_FIRST(&sc->ipmi_pending_requests);
+	while (req != NULL) {
+		next = TAILQ_NEXT(req, ir_link);
+
 		if (req->ir_owner == dp) {
 			TAILQ_REMOVE(&sc->ipmi_pending_requests, req, ir_link);
 			ipmi_free_request(req);
-			goto restart;
 		}
+		req = next;
 	}
 	IPMI_UNLOCK(sc);