From owner-svn-src-projects@freebsd.org Thu Dec 3 02:00:38 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 74BC9A3F75A for ; Thu, 3 Dec 2015 02:00:38 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2A6461B4A; Thu, 3 Dec 2015 02:00:38 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB320bmF006598; Thu, 3 Dec 2015 02:00:37 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB320bQ9006596; Thu, 3 Dec 2015 02:00:37 GMT (envelope-from np@FreeBSD.org) Message-Id: <201512030200.tB320bQ9006596@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Thu, 3 Dec 2015 02:00:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r291670 - projects/cxl_iscsi/sys/dev/cxgbe/cxgbei X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Dec 2015 02:00:38 -0000 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;