From owner-svn-src-projects@freebsd.org Wed Dec 2 23:44:31 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 25B67A3F4A5 for ; Wed, 2 Dec 2015 23:44:31 +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 D707118C7; Wed, 2 Dec 2015 23:44:30 +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 tB2NiTPZ069167; Wed, 2 Dec 2015 23:44:29 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB2NiToX069165; Wed, 2 Dec 2015 23:44:29 GMT (envelope-from np@FreeBSD.org) Message-Id: <201512022344.tB2NiToX069165@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Wed, 2 Dec 2015 23:44:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r291663 - in 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: Wed, 02 Dec 2015 23:44:31 -0000 Author: np Date: Wed Dec 2 23:44:29 2015 New Revision: 291663 URL: https://svnweb.freebsd.org/changeset/base/291663 Log: s/iscsi_softc/iscsi_ulp_softc to keep things cscope friendly. (iscsi(4) has a struct iscsi_softc already). Modified: projects/cxl_iscsi/sys/dev/cxgbe/adapter.h projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c Modified: projects/cxl_iscsi/sys/dev/cxgbe/adapter.h ============================================================================== --- projects/cxl_iscsi/sys/dev/cxgbe/adapter.h Wed Dec 2 23:41:15 2015 (r291662) +++ projects/cxl_iscsi/sys/dev/cxgbe/adapter.h Wed Dec 2 23:44:29 2015 (r291663) @@ -754,7 +754,7 @@ struct adapter { void *tom_softc; /* (struct tom_data *) */ struct tom_tunables tt; void *iwarp_softc; /* (struct c4iw_dev *) */ - void *iscsi_softc; /* (struct cxgbei_data *) */ + void *iscsi_ulp_softc; /* (struct cxgbei_data *) */ #endif struct l2t_data *l2t; /* L2 table */ struct tid_info tids; Modified: projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c ============================================================================== --- projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c Wed Dec 2 23:41:15 2015 (r291662) +++ projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c Wed Dec 2 23:44:29 2015 (r291663) @@ -371,7 +371,7 @@ cxgbei_task_reserve_itt(struct icl_conn struct cxgbei_sgl *sge = NULL; struct toepcb *toep = icc->toep; struct adapter *sc = td_adapter(toep->td); - struct cxgbei_data *ci = sc->iscsi_softc; + struct cxgbei_data *ci = sc->iscsi_ulp_softc; int err = -1; MPASS(icc->icc_signature == CXGBEI_CONN_SIGNATURE); @@ -419,7 +419,7 @@ cxgbei_task_reserve_ttt(struct icl_conn struct icl_cxgbei_conn *icc = ic_to_icc(ic); struct toepcb *toep = icc->toep; struct adapter *sc = td_adapter(toep->td); - struct cxgbei_data *ci = sc->iscsi_softc; + struct cxgbei_data *ci = sc->iscsi_ulp_softc; struct cxgbei_task_data *tdata = NULL; int xferlen, err = -1; struct cxgbei_sgl *sge = NULL; @@ -459,7 +459,7 @@ t4_sk_ddp_tag_release(struct icl_cxgbei_ { struct toepcb *toep = icc->toep; struct adapter *sc = td_adapter(toep->td); - struct cxgbei_data *ci = sc->iscsi_softc; + struct cxgbei_data *ci = sc->iscsi_ulp_softc; cxgbei_ulp2_ddp_tag_release(ci, ddp_tag, icc); @@ -788,7 +788,7 @@ cxgbei_cleanup_task(void *conn, void *of struct icl_cxgbei_conn *icc = ic_to_icc(ic); struct cxgbei_task_data *tdata = ofld_priv; struct adapter *sc = icc->sc; - struct cxgbei_data *ci = sc->iscsi_softc; + struct cxgbei_data *ci = sc->iscsi_ulp_softc; MPASS(icc->icc_signature == CXGBEI_CONN_SIGNATURE); MPASS(tdata != NULL); @@ -830,7 +830,7 @@ cxgbei_activate(struct adapter *sc) } t4_register_cpl_handler_with_tom(sc); - sc->iscsi_softc = ci; + sc->iscsi_ulp_softc = ci; return (0); } @@ -841,11 +841,11 @@ cxgbei_deactivate(struct adapter *sc) ASSERT_SYNCHRONIZED_OP(sc); - if (sc->iscsi_softc != NULL) { - cxgbei_ddp_cleanup(sc->iscsi_softc); + if (sc->iscsi_ulp_softc != NULL) { + cxgbei_ddp_cleanup(sc->iscsi_ulp_softc); t4_unregister_cpl_handler_with_tom(sc); - free(sc->iscsi_softc, M_CXGBE); - sc->iscsi_softc = NULL; + free(sc->iscsi_ulp_softc, M_CXGBE); + sc->iscsi_ulp_softc = NULL; } return (0);