diff options
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_rscn.c')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_rscn.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/scsi/qla2xxx/qla_rscn.c b/drivers/scsi/qla2xxx/qla_rscn.c index 416fb7308e87..af68590c3d11 100644 --- a/drivers/scsi/qla2xxx/qla_rscn.c +++ b/drivers/scsi/qla2xxx/qla_rscn.c | |||
@@ -82,7 +82,7 @@ static int qla2x00_send_login_iocb(scsi_qla_host_t *, struct io_descriptor *, | |||
82 | static int qla2x00_send_login_iocb_cb(scsi_qla_host_t *, struct io_descriptor *, | 82 | static int qla2x00_send_login_iocb_cb(scsi_qla_host_t *, struct io_descriptor *, |
83 | struct mbx_entry *); | 83 | struct mbx_entry *); |
84 | 84 | ||
85 | /** | 85 | /** |
86 | * Mailbox IOCB callback array. | 86 | * Mailbox IOCB callback array. |
87 | **/ | 87 | **/ |
88 | static int (*iocb_function_cb_list[LAST_IOCB_CB]) | 88 | static int (*iocb_function_cb_list[LAST_IOCB_CB]) |
@@ -95,7 +95,7 @@ static int (*iocb_function_cb_list[LAST_IOCB_CB]) | |||
95 | }; | 95 | }; |
96 | 96 | ||
97 | 97 | ||
98 | /** | 98 | /** |
99 | * Generic IO descriptor handle routines. | 99 | * Generic IO descriptor handle routines. |
100 | **/ | 100 | **/ |
101 | 101 | ||
@@ -169,7 +169,7 @@ qla2x00_handle_to_iodesc(scsi_qla_host_t *ha, uint32_t handle) | |||
169 | } | 169 | } |
170 | 170 | ||
171 | 171 | ||
172 | /** | 172 | /** |
173 | * IO descriptor allocation routines. | 173 | * IO descriptor allocation routines. |
174 | **/ | 174 | **/ |
175 | 175 | ||
@@ -248,7 +248,7 @@ qla2x00_init_io_descriptors(scsi_qla_host_t *ha) | |||
248 | } | 248 | } |
249 | 249 | ||
250 | 250 | ||
251 | /** | 251 | /** |
252 | * IO descriptor timer routines. | 252 | * IO descriptor timer routines. |
253 | **/ | 253 | **/ |
254 | 254 | ||
@@ -299,7 +299,7 @@ qla2x00_add_iodesc_timer(struct io_descriptor *iodesc) | |||
299 | add_timer(&iodesc->timer); | 299 | add_timer(&iodesc->timer); |
300 | } | 300 | } |
301 | 301 | ||
302 | /** | 302 | /** |
303 | * IO descriptor support routines. | 303 | * IO descriptor support routines. |
304 | **/ | 304 | **/ |
305 | 305 | ||
@@ -333,7 +333,7 @@ qla2x00_update_login_fcport(scsi_qla_host_t *ha, struct mbx_entry *mbxstat, | |||
333 | } | 333 | } |
334 | 334 | ||
335 | 335 | ||
336 | /** | 336 | /** |
337 | * Mailbox IOCB commands. | 337 | * Mailbox IOCB commands. |
338 | **/ | 338 | **/ |
339 | 339 | ||
@@ -383,7 +383,7 @@ qla2x00_get_mbx_iocb_entry(scsi_qla_host_t *ha, uint32_t handle) | |||
383 | * Returns QLA_SUCCESS if the IOCB was issued. | 383 | * Returns QLA_SUCCESS if the IOCB was issued. |
384 | */ | 384 | */ |
385 | static int | 385 | static int |
386 | qla2x00_send_abort_iocb(scsi_qla_host_t *ha, struct io_descriptor *iodesc, | 386 | qla2x00_send_abort_iocb(scsi_qla_host_t *ha, struct io_descriptor *iodesc, |
387 | uint32_t handle_to_abort, int ha_locked) | 387 | uint32_t handle_to_abort, int ha_locked) |
388 | { | 388 | { |
389 | unsigned long flags = 0; | 389 | unsigned long flags = 0; |
@@ -720,7 +720,7 @@ qla2x00_send_login_iocb_cb(scsi_qla_host_t *ha, struct io_descriptor *iodesc, | |||
720 | /* Only process the last command. */ | 720 | /* Only process the last command. */ |
721 | if (remote_fcport->iodesc_idx_sent != iodesc->idx) { | 721 | if (remote_fcport->iodesc_idx_sent != iodesc->idx) { |
722 | DEBUG14(printk("scsi(%ld): Login IOCB -- ignoring, sent to " | 722 | DEBUG14(printk("scsi(%ld): Login IOCB -- ignoring, sent to " |
723 | "[%02x%02x%02x], expected %x, received %x.\n", | 723 | "[%02x%02x%02x], expected %x, received %x.\n", |
724 | ha->host_no, iodesc->d_id.b.domain, iodesc->d_id.b.area, | 724 | ha->host_no, iodesc->d_id.b.domain, iodesc->d_id.b.area, |
725 | iodesc->d_id.b.al_pa, remote_fcport->iodesc_idx_sent, | 725 | iodesc->d_id.b.al_pa, remote_fcport->iodesc_idx_sent, |
726 | iodesc->idx)); | 726 | iodesc->idx)); |
@@ -754,9 +754,9 @@ qla2x00_send_login_iocb_cb(scsi_qla_host_t *ha, struct io_descriptor *iodesc, | |||
754 | 754 | ||
755 | DEBUG14(printk("scsi(%ld): Login IOCB -- status=%x mb1=%x pn=" | 755 | DEBUG14(printk("scsi(%ld): Login IOCB -- status=%x mb1=%x pn=" |
756 | "%02x%02x%02x%02x%02x%02x%02x%02x.\n", ha->host_no, status, | 756 | "%02x%02x%02x%02x%02x%02x%02x%02x.\n", ha->host_no, status, |
757 | mb[1], mbxstat->port_name[0], mbxstat->port_name[1], | 757 | mb[1], mbxstat->port_name[0], mbxstat->port_name[1], |
758 | mbxstat->port_name[2], mbxstat->port_name[3], | 758 | mbxstat->port_name[2], mbxstat->port_name[3], |
759 | mbxstat->port_name[4], mbxstat->port_name[5], | 759 | mbxstat->port_name[4], mbxstat->port_name[5], |
760 | mbxstat->port_name[6], mbxstat->port_name[7])); | 760 | mbxstat->port_name[6], mbxstat->port_name[7])); |
761 | 761 | ||
762 | memcpy(remote_fcport->node_name, mbxstat->node_name, WWN_SIZE); | 762 | memcpy(remote_fcport->node_name, mbxstat->node_name, WWN_SIZE); |
@@ -1052,7 +1052,7 @@ qla2x00_send_login_iocb_cb(scsi_qla_host_t *ha, struct io_descriptor *iodesc, | |||
1052 | } | 1052 | } |
1053 | 1053 | ||
1054 | 1054 | ||
1055 | /** | 1055 | /** |
1056 | * IO descriptor processing routines. | 1056 | * IO descriptor processing routines. |
1057 | **/ | 1057 | **/ |
1058 | 1058 | ||
@@ -1136,7 +1136,7 @@ qla2x00_handle_port_rscn(scsi_qla_host_t *ha, uint32_t rscn_entry, | |||
1136 | remote_fcport = rscn_fcport; | 1136 | remote_fcport = rscn_fcport; |
1137 | } | 1137 | } |
1138 | 1138 | ||
1139 | /* | 1139 | /* |
1140 | * If the port is already in our fcport list and online, send an ADISC | 1140 | * If the port is already in our fcport list and online, send an ADISC |
1141 | * to see if it's still alive. Issue login if a new fcport or the known | 1141 | * to see if it's still alive. Issue login if a new fcport or the known |
1142 | * fcport is currently offline. | 1142 | * fcport is currently offline. |
@@ -1191,7 +1191,7 @@ qla2x00_handle_port_rscn(scsi_qla_host_t *ha, uint32_t rscn_entry, | |||
1191 | } | 1191 | } |
1192 | return (QLA_SUCCESS); | 1192 | return (QLA_SUCCESS); |
1193 | } | 1193 | } |
1194 | 1194 | ||
1195 | /* Send ADISC if the fcport is online */ | 1195 | /* Send ADISC if the fcport is online */ |
1196 | if (atomic_read(&remote_fcport->state) == FCS_ONLINE || | 1196 | if (atomic_read(&remote_fcport->state) == FCS_ONLINE || |
1197 | remote_fcport->iodesc_idx_sent == IODESC_ADISC_NEEDED) { | 1197 | remote_fcport->iodesc_idx_sent == IODESC_ADISC_NEEDED) { |
@@ -1229,7 +1229,7 @@ qla2x00_handle_port_rscn(scsi_qla_host_t *ha, uint32_t rscn_entry, | |||
1229 | * abort. | 1229 | * abort. |
1230 | */ | 1230 | */ |
1231 | uint32_t handle_to_abort; | 1231 | uint32_t handle_to_abort; |
1232 | 1232 | ||
1233 | iodesc = &ha->io_descriptors[ | 1233 | iodesc = &ha->io_descriptors[ |
1234 | remote_fcport->iodesc_idx_sent]; | 1234 | remote_fcport->iodesc_idx_sent]; |
1235 | qla2x00_remove_iodesc_timer(iodesc); | 1235 | qla2x00_remove_iodesc_timer(iodesc); |