diff options
| author | Nilesh Javali <nilesh.javali@qlogic.com> | 2013-12-16 06:49:36 -0500 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-03-15 13:19:12 -0400 |
| commit | 7f15ebceb174d5588e715c7de714e78595fcefc8 (patch) | |
| tree | 9067fb25d0ad7f26aaea2518c54980a76fb4c80b /drivers/scsi/qla4xxx/ql4_isr.c | |
| parent | 56ccb988ce242eb2272fae5ac38e28bbd08268cf (diff) | |
[SCSI] qla4xxx: Rename ACB_STATE macros with IP_ADDRSTATE macros
Signed-off-by: Nilesh Javali <nilesh.javali@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/qla4xxx/ql4_isr.c')
| -rw-r--r-- | drivers/scsi/qla4xxx/ql4_isr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c index a3c8bc7706c2..e56c6b4778cc 100644 --- a/drivers/scsi/qla4xxx/ql4_isr.c +++ b/drivers/scsi/qla4xxx/ql4_isr.c | |||
| @@ -781,21 +781,21 @@ static void qla4xxx_isr_decode_mailbox(struct scsi_qla_host * ha, | |||
| 781 | mbox_sts[3]); | 781 | mbox_sts[3]); |
| 782 | /* mbox_sts[2] = Old ACB state | 782 | /* mbox_sts[2] = Old ACB state |
| 783 | * mbox_sts[3] = new ACB state */ | 783 | * mbox_sts[3] = new ACB state */ |
| 784 | if ((mbox_sts[3] == ACB_STATE_VALID) && | 784 | if ((mbox_sts[3] == IP_ADDRSTATE_PREFERRED) && |
| 785 | ((mbox_sts[2] == ACB_STATE_TENTATIVE) || | 785 | ((mbox_sts[2] == IP_ADDRSTATE_TENTATIVE) || |
| 786 | (mbox_sts[2] == ACB_STATE_ACQUIRING))) { | 786 | (mbox_sts[2] == IP_ADDRSTATE_ACQUIRING))) { |
| 787 | set_bit(DPC_GET_DHCP_IP_ADDR, &ha->dpc_flags); | 787 | set_bit(DPC_GET_DHCP_IP_ADDR, &ha->dpc_flags); |
| 788 | } else if ((mbox_sts[3] == ACB_STATE_ACQUIRING) && | 788 | } else if ((mbox_sts[3] == IP_ADDRSTATE_ACQUIRING) && |
| 789 | (mbox_sts[2] == ACB_STATE_VALID)) { | 789 | (mbox_sts[2] == IP_ADDRSTATE_PREFERRED)) { |
| 790 | if (is_qla80XX(ha)) | 790 | if (is_qla80XX(ha)) |
| 791 | set_bit(DPC_RESET_HA_FW_CONTEXT, | 791 | set_bit(DPC_RESET_HA_FW_CONTEXT, |
| 792 | &ha->dpc_flags); | 792 | &ha->dpc_flags); |
| 793 | else | 793 | else |
| 794 | set_bit(DPC_RESET_HA, &ha->dpc_flags); | 794 | set_bit(DPC_RESET_HA, &ha->dpc_flags); |
| 795 | } else if (mbox_sts[3] == ACB_STATE_DISABLING) { | 795 | } else if (mbox_sts[3] == IP_ADDRSTATE_DISABLING) { |
| 796 | ql4_printk(KERN_INFO, ha, "scsi%ld: %s: ACB in disabling state\n", | 796 | ql4_printk(KERN_INFO, ha, "scsi%ld: %s: ACB in disabling state\n", |
| 797 | ha->host_no, __func__); | 797 | ha->host_no, __func__); |
| 798 | } else if ((mbox_sts[3] == ACB_STATE_UNCONFIGURED)) { | 798 | } else if (mbox_sts[3] == IP_ADDRSTATE_UNCONFIGURED) { |
| 799 | complete(&ha->disable_acb_comp); | 799 | complete(&ha->disable_acb_comp); |
| 800 | ql4_printk(KERN_INFO, ha, "scsi%ld: %s: ACB state unconfigured\n", | 800 | ql4_printk(KERN_INFO, ha, "scsi%ld: %s: ACB state unconfigured\n", |
| 801 | ha->host_no, __func__); | 801 | ha->host_no, __func__); |