Message ID | 20190215085011.108577-1-hare@suse.de (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | [v3] fcoe: make use of fip_mode enum complete | expand |
Hi Sedat, Thank you for the patch! Yet something to improve: [auto build test ERROR on scsi/for-next] [also build test ERROR on v5.0-rc4 next-20190215] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Hannes-Reinecke/fcoe-make-use-of-fip_mode-enum-complete/20190215-175222 base: https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git for-next config: x86_64-randconfig-x017-201906 (attached as .config) compiler: gcc-8 (Debian 8.2.0-20) 8.2.0 reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All errors (new ones prefixed by >>): drivers/scsi//fcoe/fcoe_ctlr.c: In function 'fcoe_ctlr_link_up': >> drivers/scsi//fcoe/fcoe_ctlr.c:460:4: error: implicit declaration of function 'fcoe_ctrl_set_state'; did you mean 'fcoe_ctlr_set_state'? [-Werror=implicit-function-declaration] fcoe_ctrl_set_state(fip, FIP_ST_AUTO); ^~~~~~~~~~~~~~~~~~~ fcoe_ctlr_set_state cc1: some warnings being treated as errors vim +460 drivers/scsi//fcoe/fcoe_ctlr.c 443 444 /** 445 * fcoe_ctlr_link_up() - Start FCoE controller 446 * @fip: The FCoE controller to start 447 * 448 * Called from the LLD when the network link is ready. 449 */ 450 void fcoe_ctlr_link_up(struct fcoe_ctlr *fip) 451 { 452 mutex_lock(&fip->ctlr_mutex); 453 if (fip->state == FIP_ST_NON_FIP || fip->state == FIP_ST_AUTO) { 454 mutex_unlock(&fip->ctlr_mutex); 455 fc_linkup(fip->lp); 456 } else if (fip->state == FIP_ST_LINK_WAIT) { 457 if (fip->mode == FIP_MODE_NON_FIP) 458 fcoe_ctlr_set_state(fip, FIP_ST_NON_FIP); 459 else > 460 fcoe_ctrl_set_state(fip, FIP_ST_AUTO); 461 switch (fip->mode) { 462 default: 463 LIBFCOE_FIP_DBG(fip, "invalid mode %d\n", fip->mode); 464 /* fall-through */ 465 case FIP_MODE_AUTO: 466 LIBFCOE_FIP_DBG(fip, "%s", "setting AUTO mode.\n"); 467 /* fall-through */ 468 case FIP_MODE_FABRIC: 469 case FIP_MODE_NON_FIP: 470 mutex_unlock(&fip->ctlr_mutex); 471 fc_linkup(fip->lp); 472 fcoe_ctlr_solicit(fip, NULL); 473 break; 474 case FIP_MODE_VN2VN: 475 fcoe_ctlr_vn_start(fip); 476 mutex_unlock(&fip->ctlr_mutex); 477 fc_linkup(fip->lp); 478 break; 479 } 480 } else 481 mutex_unlock(&fip->ctlr_mutex); 482 } 483 EXPORT_SYMBOL(fcoe_ctlr_link_up); 484 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation
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 @@ static struct bnx2fc_hba *bnx2fc_hba_create(struct cnic_dev *cnic) 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..b222b300f8df 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_ctrl_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 f4909cd206d3..b381ab066b9c 100644 --- a/drivers/scsi/fcoe/fcoe_transport.c +++ b/drivers/scsi/fcoe/fcoe_transport.c @@ -873,7 +873,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)(long)kp->arg; mutex_lock(&ft_mutex); diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c index 9bbc19fc190b..9f9431a4cc0e 100644 --- a/drivers/scsi/qedf/qedf_main.c +++ b/drivers/scsi/qedf/qedf_main.c @@ -1418,7 +1418,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; diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h index cb8a273732cf..bb8092fa1e36 100644 --- a/include/scsi/libfcoe.h +++ b/include/scsi/libfcoe.h @@ -79,7 +79,7 @@ enum fip_state { * It must not change after fcoe_ctlr_init() sets it. */ enum fip_mode { - FIP_MODE_AUTO = FIP_ST_AUTO, + FIP_MODE_AUTO, FIP_MODE_NON_FIP, FIP_MODE_FABRIC, FIP_MODE_VN2VN, @@ -250,7 +250,7 @@ struct fcoe_rport { }; /* FIP API functions */ -void fcoe_ctlr_init(struct fcoe_ctlr *, enum fip_state); +void fcoe_ctlr_init(struct fcoe_ctlr *, enum fip_mode); void fcoe_ctlr_destroy(struct fcoe_ctlr *); void fcoe_ctlr_link_up(struct fcoe_ctlr *); int fcoe_ctlr_link_down(struct fcoe_ctlr *);