Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0807619d authored by Robert Love's avatar Robert Love
Browse files

libfc, fcoe, bnx2fc: Split fc_disc_init into fc_disc_{init, config} 



Split discovery initialization in code that is setup once (fcoe_disc_init)
and code that can be re-configured (fcoe_disc_config).

Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Tested-by: default avatarJack Morgan <jack.morgan@intel.com>
Reviewed-by: default avatarBhanu Prakash Gollapudi <bprakash@broadcom.com>
parent 8a9a7138

drivers/scsi/bnx2fc/bnx2fc_fcoe.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -939,7 +939,8 @@ static int bnx2fc_libfc_config(struct fc_lport *lport) 
	fc_elsct_init(lport);

	fc_elsct_init(lport);

	fc_exch_init(lport);

	fc_exch_init(lport);

	fc_rport_init(lport);

	fc_rport_init(lport);

	fc_disc_init(lport, lport);

	fc_disc_init(lport);

	fc_disc_config(lport, lport);

	return 0;

	return 0;

}

}

drivers/scsi/fcoe/fcoe_ctlr.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -2847,7 +2847,8 @@ int fcoe_libfc_config(struct fc_lport *lport, struct fcoe_ctlr *fip, 
		priv = fip;

		priv = fip;

	}

	}





	fc_disc_init(lport, priv);

	fc_disc_init(lport);

	fc_disc_config(lport, priv);





	return 0;

	return 0;

}

}

drivers/scsi/libfc/fc_disc.c

+17 −8
Original line number Original line Diff line number Diff line
@@ -712,13 +712,13 @@ static void fc_disc_stop_final(struct fc_lport *lport) 
}

}





/**

/**

 * fc_disc_init() - Initialize the discovery layer for a local port

 * fc_disc_config() - Configure the discovery layer for a local port

 * @lport: The local port that needs the discovery layer to be initialized

 * @lport: The local port that needs the discovery layer to be configured

 * @priv: Private data structre for users of the discovery layer

 * @priv: Private data structre for users of the discovery layer

 */

 */

int fc_disc_init(struct fc_lport *lport, void *priv)

void fc_disc_config(struct fc_lport *lport, void *priv)

{

{

	struct fc_disc *disc;

	struct fc_disc *disc = &lport->disc;





	if (!lport->tt.disc_start)

	if (!lport->tt.disc_start)

		lport->tt.disc_start = fc_disc_start;

		lport->tt.disc_start = fc_disc_start;
@@ -733,12 +733,21 @@ int fc_disc_init(struct fc_lport *lport, void *priv) 
		lport->tt.disc_recv_req = fc_disc_recv_req;

		lport->tt.disc_recv_req = fc_disc_recv_req;





	disc = &lport->disc;

	disc = &lport->disc;

	INIT_DELAYED_WORK(&disc->disc_work, fc_disc_timeout);

	mutex_init(&disc->disc_mutex);

	INIT_LIST_HEAD(&disc->rports);





	disc->priv = priv;

	disc->priv = priv;

}

EXPORT_SYMBOL(fc_disc_config);





	return 0;

/**

 * fc_disc_init() - Initialize the discovery layer for a local port

 * @lport: The local port that needs the discovery layer to be initialized

 */

void fc_disc_init(struct fc_lport *lport)

{

	struct fc_disc *disc = &lport->disc;



	INIT_DELAYED_WORK(&disc->disc_work, fc_disc_timeout);

	mutex_init(&disc->disc_mutex);

	INIT_LIST_HEAD(&disc->rports);

}

}

EXPORT_SYMBOL(fc_disc_init);
 
EXPORT_SYMBOL(fc_disc_init);

include/scsi/libfc.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -1074,7 +1074,8 @@ void fc_rport_terminate_io(struct fc_rport *); 
/*

/*

 * DISCOVERY LAYER

 * DISCOVERY LAYER

 *****************************/

 *****************************/

int fc_disc_init(struct fc_lport *, void *);

void fc_disc_init(struct fc_lport *);

void fc_disc_config(struct fc_lport *, void *);





static inline struct fc_lport *fc_disc_lport(struct fc_disc *disc)

static inline struct fc_lport *fc_disc_lport(struct fc_disc *disc)

{

{