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

Commit 22bcd225 authored by Joe Eykholt's avatar Joe Eykholt Committed by James Bottomley
Browse files

[SCSI] libfcoe: Allow FIP to be disabled by the driver 



Allow FIP to be disabled by the driver for devices
that want to use libfcoe in non-FIP mode.

The driver merely sets the fcoe_ctlr mode to the state which
should be entered when the link comes up.  The default is auto.
No change is needed for fcoe.c which uses auto mode.

Signed-off-by: default avatarJoe Eykholt <jeykholt@cisco.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 84c3e1ad

drivers/scsi/fcoe/libfcoe.c

+4 −2
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ static inline int fcoe_ctlr_fcf_usable(struct fcoe_fcf *fcf) 
void fcoe_ctlr_init(struct fcoe_ctlr *fip)

{

	fip->state = FIP_ST_LINK_WAIT;

	fip->mode = FIP_ST_AUTO;

	INIT_LIST_HEAD(&fip->fcfs);

	spin_lock_init(&fip->lock);

	fip->flogi_oxid = FC_XID_UNKNOWN;
@@ -261,10 +262,11 @@ void fcoe_ctlr_link_up(struct fcoe_ctlr *fip) 
		spin_unlock_bh(&fip->lock);

		fc_linkup(fip->lp);

	} else if (fip->state == FIP_ST_LINK_WAIT) {

		fip->state = FIP_ST_AUTO;

		fip->state = fip->mode;

		fip->last_link = 1;

		fip->link = 1;

		spin_unlock_bh(&fip->lock);

		if (fip->state == FIP_ST_AUTO)

			LIBFCOE_FIP_DBG("%s", "setting AUTO mode.\n");

		fc_linkup(fip->lp);

		fcoe_ctlr_solicit(fip, NULL);

include/scsi/libfcoe.h

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ enum fip_state { 
/**

 * struct fcoe_ctlr - FCoE Controller and FIP state

 * @state:	   internal FIP state for network link and FIP or non-FIP mode.

 * @mode:	   LLD-selected mode.

 * @lp:		   &fc_lport: libfc local port.

 * @sel_fcf:	   currently selected FCF, or NULL.

 * @fcfs:	   list of discovered FCFs.
@@ -89,6 +90,7 @@ enum fip_state { 
 */

struct fcoe_ctlr {

	enum fip_state state;

	enum fip_state mode;

	struct fc_lport *lp;

	struct fcoe_fcf *sel_fcf;

	struct list_head fcfs;