d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s/iscsi_softc/iscsi_ulp_softc to keep things cscope friendly.

Browse Source 
(iscsi(4) has a struct iscsi_softc already).
This commit is contained in:
Navdeep Parhar 2015-12-02 23:44:29 +00:00
parent e2b09c9a4f
commit bf92350c27
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/projects/cxl_iscsi/; revision=291663
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/cxgbe/adapter.h
View File

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

18
sys/dev/cxgbe/cxgbei/cxgbei.c
View File

@ -371,7 +371,7 @@ cxgbei_task_reserve_itt(struct icl_conn *ic, void **prv,
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 *ic, void **prv, union ctl_io *io,
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_conn *icc, unsigned int ddp_tag)
{
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 *ofld_priv)
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);