Index: mpt.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ic/mpt.c,v
retrieving revision 1.14
diff -p -r1.14 mpt.c
*** mpt.c	28 Apr 2010 22:45:27 -0000	1.14
--- mpt.c	23 May 2011 18:07:02 -0000
*************** mpt_init(mpt_softc_t *mpt, u_int32_t who
*** 1131,1137 ****
          int try;
          MSG_IOC_FACTS_REPLY facts;
          MSG_PORT_FACTS_REPLY pfp;
! 	u_int32_t pptr;
          int val;
  
  	/* Put all request buffers (back) on the free list */
--- 1131,1139 ----
          int try;
          MSG_IOC_FACTS_REPLY facts;
          MSG_PORT_FACTS_REPLY pfp;
!         prop_dictionary_t dict;
!         uint32_t ini_id;
!         uint32_t pptr;
          int val;
  
  	/* Put all request buffers (back) on the free list */
*************** mpt_init(mpt_softc_t *mpt, u_int32_t who
*** 1151,1156 ****
--- 1153,1160 ----
  	if (mpt_hw_init(mpt) != 0)
  		return (EIO);
  
+ 	dict = device_properties(sc->sc_dev);
+ 
  	for (try = 0; try < MPT_MAX_TRYS; try++) {
  		/*
  		 * No need to reset if the IOC is already in the READY state.
*************** mpt_init(mpt_softc_t *mpt, u_int32_t who
*** 1209,1215 ****
  			return (ENXIO);
  		}
  
! 		mpt->mpt_ini_id = pfp.PortSCSIID;
  
  		if (mpt_send_ioc_init(mpt, who) != MPT_OK) {
  			mpt_prt(mpt, "mpt_send_ioc_init failed");
--- 1213,1223 ----
  			return (ENXIO);
  		}
  
! 		if (!mpt->is_sas && !mpt->is_fc &&
! 		    prop_dictionary_get_uint32(dict, "initiator-id", &ini_id))
! 			mpt->mpt_ini_id = ini_id;
! 		else
! 			mpt->mpt_ini_id = pfp.PortSCSIID;
  
  		if (mpt_send_ioc_init(mpt, who) != MPT_OK) {
  			mpt_prt(mpt, "mpt_send_ioc_init failed");