From 4dc4ba43f0cb73c6eb84adf77af27c6d20ab72da Mon Sep 17 00:00:00 2001 From: James Smart Date: Thu, 3 Jan 2013 15:44:16 -0500 Subject: [PATCH] --- yaml --- r: 359467 b: refs/heads/master c: 421c66228a168f65494511231265594545c7f1da h: refs/heads/master i: 359465: 799bf23d16c770d6e05ceeccc426138f6db84661 359463: 56d68bc5f356d4f0e5cd27564d38cce3eb320143 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/lpfc/lpfc_sli.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 31c144d5a52c..1035959da90b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a630c2788e87c65d1ac5ff23bbea10a3b1fbc30 +refs/heads/master: 421c66228a168f65494511231265594545c7f1da diff --git a/trunk/drivers/scsi/lpfc/lpfc_sli.c b/trunk/drivers/scsi/lpfc/lpfc_sli.c index fde41b864384..55b6fc83ad71 100644 --- a/trunk/drivers/scsi/lpfc/lpfc_sli.c +++ b/trunk/drivers/scsi/lpfc/lpfc_sli.c @@ -15556,10 +15556,13 @@ lpfc_sli4_fcf_rr_next_index_get(struct lpfc_hba *phba) { uint16_t next_fcf_index; +initial_priority: /* Search start from next bit of currently registered FCF index */ + next_fcf_index = phba->fcf.current_rec.fcf_indx; + next_priority: - next_fcf_index = (phba->fcf.current_rec.fcf_indx + 1) % - LPFC_SLI4_FCF_TBL_INDX_MAX; + /* Determine the next fcf index to check */ + next_fcf_index = (next_fcf_index + 1) % LPFC_SLI4_FCF_TBL_INDX_MAX; next_fcf_index = find_next_bit(phba->fcf.fcf_rr_bmask, LPFC_SLI4_FCF_TBL_INDX_MAX, next_fcf_index); @@ -15586,7 +15589,7 @@ lpfc_sli4_fcf_rr_next_index_get(struct lpfc_hba *phba) * at that level and continue the selection process. */ if (lpfc_check_next_fcf_pri_level(phba)) - goto next_priority; + goto initial_priority; lpfc_printf_log(phba, KERN_WARNING, LOG_FIP, "2844 No roundrobin failover FCF available\n"); if (next_fcf_index >= LPFC_SLI4_FCF_TBL_INDX_MAX)