5 files changed, 9 insertions, 6 deletions

diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index 2e4e7159ebf9..a75e74ad1698 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -1438,7 +1438,7 @@ bind_err:
 static struct bnx2fc_interface *
 bnx2fc_interface_create(struct bnx2fc_hba *hba,
                         struct net_device *netdev,
-                        enum fip_state fip_mode)
+                        enum fip_mode fip_mode)
 {
         struct fcoe_ctlr_device *ctlr_dev;
         struct bnx2fc_interface *interface;
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index cd19be3f3405..8ba8862d3292 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -389,7 +389,7 @@ static int fcoe_interface_setup(struct fcoe_interface *fcoe,
  * Returns: pointer to a struct fcoe_interface or NULL on error
  */
 static struct fcoe_interface *fcoe_interface_create(struct net_device *netdev,
-                                                    enum fip_state fip_mode)
+                                                    enum fip_mode fip_mode)
 {
         struct fcoe_ctlr_device *ctlr_dev;
         struct fcoe_ctlr *ctlr;
diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c
index 54da3166da8d..7dc4ffa24430 100644
--- a/drivers/scsi/fcoe/fcoe_ctlr.c
+++ b/drivers/scsi/fcoe/fcoe_ctlr.c
@@ -147,7 +147,7 @@ static void fcoe_ctlr_map_dest(struct fcoe_ctlr *fip)
  * fcoe_ctlr_init() - Initialize the FCoE Controller instance
  * @fip: The FCoE controller to initialize
  */
-void fcoe_ctlr_init(struct fcoe_ctlr *fip, enum fip_state mode)
+void fcoe_ctlr_init(struct fcoe_ctlr *fip, enum fip_mode mode)
 {
         fcoe_ctlr_set_state(fip, FIP_ST_LINK_WAIT);
         fip->mode = mode;
@@ -454,7 +454,10 @@ void fcoe_ctlr_link_up(struct fcoe_ctlr *fip)
                 mutex_unlock(&fip->ctlr_mutex);
                 fc_linkup(fip->lp);
         } else if (fip->state == FIP_ST_LINK_WAIT) {
-                fcoe_ctlr_set_state(fip, fip->mode);
+                if (fip->mode == FIP_MODE_NON_FIP)
+                        fcoe_ctlr_set_state(fip, FIP_ST_NON_FIP);
+                else
+                        fcoe_ctlr_set_state(fip, FIP_ST_AUTO);
                 switch (fip->mode) {
                 default:
                         LIBFCOE_FIP_DBG(fip, "invalid mode %d\n", fip->mode);
diff --git a/drivers/scsi/fcoe/fcoe_transport.c b/drivers/scsi/fcoe/fcoe_transport.c
index 6d3949b687ef..29fe3426f9f2 100644
--- a/drivers/scsi/fcoe/fcoe_transport.c
+++ b/drivers/scsi/fcoe/fcoe_transport.c
@@ -872,7 +872,7 @@ static int fcoe_transport_create(const char *buffer,
         int rc = -ENODEV;
         struct net_device *netdev = NULL;
         struct fcoe_transport *ft = NULL;
-        enum fip_state fip_mode = (enum fip_state)(long)kp->arg;
+        enum fip_mode fip_mode = (enum fip_mode)kp->arg;
 
         mutex_lock(&ft_mutex);
 
diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c
index edcaf4b0cb0b..d43342b327ac 100644
--- a/drivers/scsi/qedf/qedf_main.c
+++ b/drivers/scsi/qedf/qedf_main.c
@@ -1417,7 +1417,7 @@ static struct libfc_function_template qedf_lport_template = {
 
 static void qedf_fcoe_ctlr_setup(struct qedf_ctx *qedf)
 {
-        fcoe_ctlr_init(&qedf->ctlr, FIP_ST_AUTO);
+        fcoe_ctlr_init(&qedf->ctlr, FIP_MODE_AUTO);
 
         qedf->ctlr.send = qedf_fip_send;
         qedf->ctlr.get_src_addr = qedf_get_src_mac;