Author: mav
Date: Sun Apr 2 11:00:47 2017
New Revision: 316411
URL: https://svnweb.freebsd.org/changeset/base/316411
Log:
MFC r315709: Switch from using periph_links to sim_links.
periph_links field belongs to periph drivers and must not be used here.
Modified:
stable/11/sys/dev/isp/isp_freebsd.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/isp/isp_freebsd.c
==============================================================================
--- stable/11/sys/dev/isp/isp_freebsd.c Sun Apr 2 11:00:18 2017
(r316410)
+++ stable/11/sys/dev/isp/isp_freebsd.c Sun Apr 2 11:00:47 2017
(r316411)
@@ -841,7 +841,7 @@ isp_tmcmd_restart(ispsoftc_t *isp)
ISP_GET_PC_ADDR(isp, bus, waitq, waitq);
ccb = (union ccb *)TAILQ_FIRST(waitq);
if (ccb != NULL) {
- TAILQ_REMOVE(waitq, &ccb->ccb_h, periph_links.tqe);
+ TAILQ_REMOVE(waitq, &ccb->ccb_h, sim_links.tqe);
isp_target_start_ctio(isp, ccb, FROM_TIMER);
}
}
@@ -1097,17 +1097,17 @@ isp_target_start_ctio(ispsoftc_t *isp, u
/*
* Insert at the tail of the list, if any, waiting CTIO CCBs
*/
- TAILQ_INSERT_TAIL(waitq, &ccb->ccb_h, periph_links.tqe);
+ TAILQ_INSERT_TAIL(waitq, &ccb->ccb_h, sim_links.tqe);
break;
case FROM_TIMER:
case FROM_SRR:
case FROM_CTIO_DONE:
- TAILQ_INSERT_HEAD(waitq, &ccb->ccb_h, periph_links.tqe);
+ TAILQ_INSERT_HEAD(waitq, &ccb->ccb_h, sim_links.tqe);
break;
}
while ((ccb = (union ccb *) TAILQ_FIRST(waitq)) != NULL) {
- TAILQ_REMOVE(waitq, &ccb->ccb_h, periph_links.tqe);
+ TAILQ_REMOVE(waitq, &ccb->ccb_h, sim_links.tqe);
cso = &ccb->csio;
xfrlen = cso->dxfer_len;
@@ -1156,7 +1156,7 @@ isp_target_start_ctio(ispsoftc_t *isp, u
*/
if (atp->ctcnt >= ATPD_CCB_OUTSTANDING) {
isp_prt(isp, ISP_LOGTINFO, "[0x%x] handling only %d
CCBs at a time (flags for this ccb: 0x%x)", cso->tag_id, ATPD_CCB_OUTSTANDING,
ccb->ccb_h.flags);
- TAILQ_INSERT_HEAD(waitq, &ccb->ccb_h, periph_links.tqe);
+ TAILQ_INSERT_HEAD(waitq, &ccb->ccb_h, sim_links.tqe);
break;
}
@@ -1281,7 +1281,7 @@ isp_target_start_ctio(ispsoftc_t *isp, u
if (atp->ests == NULL) {
atp->ests = isp_get_ecmd(isp);
if (atp->ests == NULL) {
-
TAILQ_INSERT_HEAD(waitq, &ccb->ccb_h, periph_links.tqe);
+
TAILQ_INSERT_HEAD(waitq, &ccb->ccb_h, sim_links.tqe);
break;
}
}
@@ -1436,7 +1436,7 @@ isp_target_start_ctio(ispsoftc_t *isp, u
if (atp->ests == NULL) {
atp->ests = isp_get_ecmd(isp);
if (atp->ests == NULL) {
-
TAILQ_INSERT_HEAD(waitq, &ccb->ccb_h, periph_links.tqe);
+
TAILQ_INSERT_HEAD(waitq, &ccb->ccb_h, sim_links.tqe);
break;
}
}
@@ -1525,13 +1525,13 @@ isp_target_start_ctio(ispsoftc_t *isp, u
if (isp_get_pcmd(isp, ccb)) {
ISP_PATH_PRT(isp, ISP_LOGWARN, ccb->ccb_h.path, "out of
PCMDs\n");
- TAILQ_INSERT_HEAD(waitq, &ccb->ccb_h, periph_links.tqe);
+ TAILQ_INSERT_HEAD(waitq, &ccb->ccb_h, sim_links.tqe);
break;
}
handle = isp_allocate_handle(isp, ccb, ISP_HANDLE_TARGET);
if (handle == 0) {
ISP_PATH_PRT(isp, ISP_LOGWARN, ccb->ccb_h.path, "No
XFLIST pointers for %s\n", __func__);
- TAILQ_INSERT_HEAD(waitq, &ccb->ccb_h, periph_links.tqe);
+ TAILQ_INSERT_HEAD(waitq, &ccb->ccb_h, sim_links.tqe);
isp_free_pcmd(isp, ccb);
break;
}
@@ -1561,7 +1561,7 @@ isp_target_start_ctio(ispsoftc_t *isp, u
isp_destroy_handle(isp, handle);
isp_free_pcmd(isp, ccb);
if (dmaresult == CMD_EAGAIN) {
- TAILQ_INSERT_HEAD(waitq, &ccb->ccb_h,
periph_links.tqe);
+ TAILQ_INSERT_HEAD(waitq, &ccb->ccb_h,
sim_links.tqe);
break;
}
ccb->ccb_h.status = CAM_REQ_CMP_ERR;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
