svn commit: r291670 - projects/cxl_iscsi/sys/dev/cxgbe/cxgbei

[Navdeep Parhar]

Author: np
Date: Thu Dec  3 02:00:36 2015
New Revision: 291670
URL: https://svnweb.freebsd.org/changeset/base/291670

Log:
  Catch up with r291665.

Modified:
  projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c
  projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c

Modified: projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c
==============================================================================
--- projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c	Thu Dec  3 00:15:03 2015	(r291669)
+++ projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c	Thu Dec  3 02:00:36 2015	(r291670)
@@ -175,7 +175,7 @@ ppod_write_idata(struct cxgbei_data *ci,
 	struct pagepod *ppod;
 	u_int i;
 	struct wrqe *wr;
-	struct adapter *sc = toep->port->adapter;
+	struct adapter *sc = toep->vi->pi->adapter;
 
 	wr = alloc_wrqe(wr_len, toep->ctrlq);
 	if (wr == NULL) {
@@ -215,8 +215,8 @@ t4_ddp_set_map(struct cxgbei_data *ci, v
 	 * the order would not be garanteed, so we will stick with IMMD
 	 */
 	gl->tid = toep->tid;
-	gl->port_id = toep->port->port_id;
-	gl->egress_dev = (void *)toep->port->ifp;
+	gl->port_id = toep->vi->pi->port_id;
+	gl->egress_dev = (void *)toep->vi->ifp;
 
 	/* send via immediate data */
 	for (; w_npods < npods; idx += cnt, w_npods += cnt,
@@ -1046,7 +1046,7 @@ cxgbei_select_worker_thread(struct icl_c
 
 	n = worker_thread_count / sc->sge.nofldrxq;
 	if (n > 0)
-		i = toep->port->port_id * n + arc4random() % n;
+		i = toep->vi->pi->port_id * n + arc4random() % n;
 	else
 		i = arc4random() % worker_thread_count;
 

Modified: projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c
==============================================================================
--- projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c	Thu Dec  3 00:15:03 2015	(r291669)
+++ projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c	Thu Dec  3 02:00:36 2015	(r291670)
@@ -676,7 +676,7 @@ icl_cxgbei_conn_handoff(struct icl_conn 
 		MPASS(tp->tod != NULL);
 		MPASS(tp->t_toe != NULL);
 		toep = tp->t_toe;
-		MPASS(toep->port->adapter == icc->sc);
+		MPASS(toep->vi->pi->adapter == icc->sc);
 		icc->toep = toep;
 		icc->cwt = cxgbei_select_worker_thread(icc);
 		icc->ulp_submode = 0;