[SCSI] lpfc 8.1.11 : Fix lpfc_multi_ring_support

It was not accounted for in the fast/slow rings.
Genericize the implementation and control it via sysfs

Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 60af1c60fe9b..a47e5ab1ec4d 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -1128,7 +1128,7 @@ lpfc_cmpl_els_adisc(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
                                                 mempool_free(mbox,
                                                      phba->mbox_mem_pool);
                                                 lpfc_disc_flush_list(phba);
-                                                psli->ring[(psli->ip_ring)].
+                                                psli->ring[(psli->extra_ring)].
                                                     flag &=
                                                     ~LPFC_STOP_IOCB_EVENT;
                                                 psli->ring[(psli->fcp_ring)].
@@ -3046,7 +3046,7 @@ lpfc_els_rcv_farp(struct lpfc_hba * phba,
         /* FARP-REQ received from DID <did> */
         lpfc_printf_log(phba,
                          KERN_INFO,
-                         LOG_IP,
+                         LOG_ELS,
                          "%d:0601 FARP-REQ received from DID x%x\n",
                          phba->brd_no, did);
 
@@ -3108,7 +3108,7 @@ lpfc_els_rcv_farpr(struct lpfc_hba * phba,
         /* FARP-RSP received from DID <did> */
         lpfc_printf_log(phba,
                          KERN_INFO,
-                         LOG_IP,
+                         LOG_ELS,
                          "%d:0600 FARP-RSP received from DID x%x\n",
                          phba->brd_no, did);