D19677.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D19677.diff
View Options

	Index: head/sys/dev/mpr/mpr.c
	===================================================================
	--- head/sys/dev/mpr/mpr.c
	+++ head/sys/dev/mpr/mpr.c
	@@ -2617,10 +2617,8 @@
	} else {
	cm = &sc->commands[
	le16toh(desc->AddressReply.SMID)];
	- KASSERT(cm->cm_state == MPR_CM_STATE_INQUEUE,
	- ("command SMID %d not inqueue\n",
	- desc->AddressReply.SMID));
	- cm->cm_state = MPR_CM_STATE_BUSY;
	+ if (cm->cm_state != MPR_CM_STATE_TIMEDOUT)
	+ cm->cm_state = MPR_CM_STATE_BUSY;
	cm->cm_reply = reply;
	cm->cm_reply_data =
	le32toh(desc->AddressReply.
	Index: head/sys/dev/mps/mps.c
	===================================================================
	--- head/sys/dev/mps/mps.c
	+++ head/sys/dev/mps/mps.c
	@@ -2481,9 +2481,8 @@
	} else {
	cm = &sc->commands[
	le16toh(desc->AddressReply.SMID)];
	- KASSERT(cm->cm_state == MPS_CM_STATE_INQUEUE,
	- ("command not inqueue\n"));
	- cm->cm_state = MPS_CM_STATE_BUSY;
	+ if (cm->cm_state != MPS_MPS_STATE_TIMEDOUT)
	+ cm->cm_state = MPS_CM_STATE_BUSY;
	cm->cm_reply = reply;
	cm->cm_reply_data = le32toh(
	desc->AddressReply.ReplyFrameAddress);