Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23443b1d authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Correct mis-handling of AENs. 



A regression in a recent change
33135aa2 caused the driver
to mistakenly drop handling of AENs.  Due to the incorrect
handling, ports would not reappear after RSCNs and LIPs.

Drops unused/incorrect compound #define from qla_def.h.

Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent bb58596f

drivers/scsi/qla2xxx/qla_def.h

+1 −9
Original line number Diff line number Diff line
@@ -2476,17 +2476,9 @@ typedef struct scsi_qla_host { 
 */

#define LOOP_TRANSITION(ha) \

	(test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) || \

	 test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags))



#define LOOP_NOT_READY(ha) \

	((test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) || \

	  test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags) || \

	 test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags) || \

	  test_bit(LOOP_RESYNC_ACTIVE, &ha->dpc_flags)) || \

	 atomic_read(&ha->loop_state) == LOOP_DOWN)



#define LOOP_RDY(ha)	(!LOOP_NOT_READY(ha))



#define TGT_Q(ha, t) (ha->otgt[t])



#define to_qla_host(x)		((scsi_qla_host_t *) (x)->hostdata)

drivers/scsi/qla2xxx/qla_init.c

+3 −3
Original line number Diff line number Diff line
@@ -1259,7 +1259,7 @@ qla2x00_configure_hba(scsi_qla_host_t *ha) 
	rval = qla2x00_get_adapter_id(ha,

	    &loop_id, &al_pa, &area, &domain, &topo);

	if (rval != QLA_SUCCESS) {

		if (LOOP_NOT_READY(ha) || atomic_read(&ha->loop_down_timer) ||

		if (LOOP_TRANSITION(ha) || atomic_read(&ha->loop_down_timer) ||

		    (rval == QLA_COMMAND_ERROR && loop_id == 0x7)) {

			DEBUG2(printk("%s(%ld) Loop is in a transition state\n",

			    __func__, ha->host_no));
@@ -1796,7 +1796,7 @@ qla2x00_configure_loop(scsi_qla_host_t *ha) 
	}



	if (rval == QLA_SUCCESS && test_bit(RSCN_UPDATE, &flags)) {

		if (LOOP_NOT_READY(ha)) {

		if (LOOP_TRANSITION(ha)) {

			rval = QLA_FUNCTION_FAILED;

		} else {

			rval = qla2x00_configure_fabric(ha);
@@ -2369,7 +2369,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *ha, struct list_head *new_fcports) 
		if (qla2x00_is_reserved_id(ha, loop_id))

			continue;



		if (atomic_read(&ha->loop_down_timer) || LOOP_NOT_READY(ha))

		if (atomic_read(&ha->loop_down_timer) || LOOP_TRANSITION(ha))

			break;



		if (swl != NULL) {