Skip to content

Commit 7e47e5c

Browse files
avasquez01James Bottomley
authored andcommitted
[SCSI] qla2xxx: Re-register FDMI information after a LIP.
Original code would (incorrectly) only re-register after a loop-down condition. Also, FDMI registration should be enabled by default. Signed-off-by: Andrew Vasquez <[email protected]> Signed-off-by: James Bottomley <[email protected]>
1 parent 0c23b85 commit 7e47e5c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

drivers/scsi/qla2xxx/qla_isr.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
409409
}
410410

411411
set_bit(REGISTER_FC4_NEEDED, &ha->dpc_flags);
412+
set_bit(REGISTER_FDMI_NEEDED, &ha->dpc_flags);
412413

413414
ha->flags.management_server_logged_in = 0;
414415
qla2x00_post_aen_work(ha, FCH_EVT_LIP, mb[1]);
@@ -454,8 +455,6 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
454455

455456
ha->flags.management_server_logged_in = 0;
456457
ha->link_data_rate = PORT_SPEED_UNKNOWN;
457-
if (ql2xfdmienable)
458-
set_bit(REGISTER_FDMI_NEEDED, &ha->dpc_flags);
459458
qla2x00_post_aen_work(ha, FCH_EVT_LINKDOWN, 0);
460459
break;
461460

@@ -511,6 +510,7 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
511510
set_bit(RESET_MARKER_NEEDED, &ha->dpc_flags);
512511
}
513512
set_bit(REGISTER_FC4_NEEDED, &ha->dpc_flags);
513+
set_bit(REGISTER_FDMI_NEEDED, &ha->dpc_flags);
514514

515515
ha->flags.gpsc_supported = 1;
516516
ha->flags.management_server_logged_in = 0;

drivers/scsi/qla2xxx/qla_os.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static void qla2x00_free_device(scsi_qla_host_t *);
6767

6868
static void qla2x00_config_dma_addressing(scsi_qla_host_t *ha);
6969

70-
int ql2xfdmienable;
70+
int ql2xfdmienable=1;
7171
module_param(ql2xfdmienable, int, S_IRUGO|S_IRUSR);
7272
MODULE_PARM_DESC(ql2xfdmienable,
7373
"Enables FDMI registratons "

0 commit comments

Comments
 (0)