svn commit: r291663 - in projects/cxl_iscsi/sys/dev/cxgbe: . cxgbei

[Navdeep Parhar]

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);