--- a/usr/src/lib/cfgadm_plugins/ib/common/cfga_ib.c	Thu Feb 05 11:59:59 2009 -0500
+++ b/usr/src/lib/cfgadm_plugins/ib/common/cfga_ib.c	Thu Feb 05 10:03:55 2009 -0800
@@ -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.
  */
 
@@ -919,11 +919,6 @@
 
 		rv = CFGA_IB_OK;	/* Other status don't matter */
 
-		if (!ib_confirm(confp, IB_CONFIRM1)) {
-			ib_cleanup_after_devctl_cmd(hdl, nvl);
-			return (CFGA_NACK);
-		}
-
 		if (devctl_ap_configure(hdl, nvl) != 0) {
 			DPRINTF("cfga_change_state: devctl_ap_configure "
 			    "failed. errno: %d\n", errno);
@@ -1284,7 +1279,7 @@
 		}
 
 		/* CHECK: Only supported on fabric ap_ids */
-		if (fab_apid == NULL) {
+		if (fab_apid == NULL || strcmp(fab_apid, IBNEX_FABRIC) != 0) {
 			DPRINTF("cfga_private_func: fabric apid needed\n");
 			return (ib_err_msg(errstring, CFGA_IB_INVALID_OP_ERR,
 			    ap_id, errno));