diff --git a/sys/dev/aacraid/aacraid.c b/sys/dev/aacraid/aacraid.c index 51a633e70515..815c5b728da4 100644 --- a/sys/dev/aacraid/aacraid.c +++ b/sys/dev/aacraid/aacraid.c @@ -3797,6 +3797,7 @@ aac_reset_adapter(struct aac_softc *sc) /* disable interrupt */ AAC_ACCESS_DEVREG(sc, AAC_DISABLE_INTERRUPT); +#if 0 /* Controller seems to return these at least some of the time after we reset */ /* * Abort all pending commands: * a) on the controller @@ -3814,7 +3815,7 @@ aac_reset_adapter(struct aac_softc *sc) wakeup(cm); } } - +#endif /* b) in the waiting queues */ while ((cm = aac_dequeue_ready(sc)) != NULL) { cm->cm_flags |= AAC_CMD_RESET; diff --git a/sys/dev/aacraid/aacraid_var.h b/sys/dev/aacraid/aacraid_var.h index bbafdafb8840..1799ef832345 100644 --- a/sys/dev/aacraid/aacraid_var.h +++ b/sys/dev/aacraid/aacraid_var.h @@ -112,7 +112,7 @@ * Rate at which we periodically check for timed out commands and kick the * controller. */ -#define AAC_PERIODIC_INTERVAL 20 /* seconds */ +#define AAC_PERIODIC_INTERVAL 1 /* seconds */ #define PASSTHROUGH_BUS 0 #define CONTAINER_BUS 1