aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla4xxx
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/qla4xxx')
-rw-r--r--drivers/scsi/qla4xxx/ql4_glbl.h7
-rw-r--r--drivers/scsi/qla4xxx/ql4_iocb.c8
-rw-r--r--drivers/scsi/qla4xxx/ql4_nvram.c3
-rw-r--r--drivers/scsi/qla4xxx/ql4_version.h3
4 files changed, 17 insertions, 4 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_glbl.h b/drivers/scsi/qla4xxx/ql4_glbl.h
index 5b00cb04e7c0..a3608e028bf6 100644
--- a/drivers/scsi/qla4xxx/ql4_glbl.h
+++ b/drivers/scsi/qla4xxx/ql4_glbl.h
@@ -8,6 +8,9 @@
8#ifndef __QLA4x_GBL_H 8#ifndef __QLA4x_GBL_H
9#define __QLA4x_GBL_H 9#define __QLA4x_GBL_H
10 10
11struct iscsi_cls_conn;
12
13void qla4xxx_hw_reset(struct scsi_qla_host *ha);
11int ql4xxx_lock_drvr_wait(struct scsi_qla_host *a); 14int ql4xxx_lock_drvr_wait(struct scsi_qla_host *a);
12int qla4xxx_send_tgts(struct scsi_qla_host *ha, char *ip, uint16_t port); 15int qla4xxx_send_tgts(struct scsi_qla_host *ha, char *ip, uint16_t port);
13int qla4xxx_send_command_to_isp(struct scsi_qla_host *ha, struct srb * srb); 16int qla4xxx_send_command_to_isp(struct scsi_qla_host *ha, struct srb * srb);
@@ -58,11 +61,13 @@ int qla4xxx_get_fw_version(struct scsi_qla_host * ha);
58void qla4xxx_interrupt_service_routine(struct scsi_qla_host * ha, 61void qla4xxx_interrupt_service_routine(struct scsi_qla_host * ha,
59 uint32_t intr_status); 62 uint32_t intr_status);
60int qla4xxx_init_rings(struct scsi_qla_host * ha); 63int qla4xxx_init_rings(struct scsi_qla_host * ha);
61struct srb * qla4xxx_del_from_active_array(struct scsi_qla_host *ha, uint32_t index); 64struct srb * qla4xxx_del_from_active_array(struct scsi_qla_host *ha,
65 uint32_t index);
62void qla4xxx_srb_compl(struct scsi_qla_host *ha, struct srb *srb); 66void qla4xxx_srb_compl(struct scsi_qla_host *ha, struct srb *srb);
63int qla4xxx_reinitialize_ddb_list(struct scsi_qla_host * ha); 67int qla4xxx_reinitialize_ddb_list(struct scsi_qla_host * ha);
64int qla4xxx_process_ddb_changed(struct scsi_qla_host * ha, 68int qla4xxx_process_ddb_changed(struct scsi_qla_host * ha,
65 uint32_t fw_ddb_index, uint32_t state); 69 uint32_t fw_ddb_index, uint32_t state);
70void qla4xxx_dump_buffer(void *b, uint32_t size);
66 71
67extern int ql4xextended_error_logging; 72extern int ql4xextended_error_logging;
68extern int ql4xdiscoverywait; 73extern int ql4xdiscoverywait;
diff --git a/drivers/scsi/qla4xxx/ql4_iocb.c b/drivers/scsi/qla4xxx/ql4_iocb.c
index a216a1781afb..6e3c8c81def3 100644
--- a/drivers/scsi/qla4xxx/ql4_iocb.c
+++ b/drivers/scsi/qla4xxx/ql4_iocb.c
@@ -6,6 +6,10 @@
6 */ 6 */
7 7
8#include "ql4_def.h" 8#include "ql4_def.h"
9#include "ql4_glbl.h"
10#include "ql4_dbg.h"
11#include "ql4_inline.h"
12
9 13
10#include <scsi/scsi_tcq.h> 14#include <scsi/scsi_tcq.h>
11 15
@@ -243,8 +247,8 @@ int qla4xxx_send_command_to_isp(struct scsi_qla_host *ha, struct srb * srb)
243 dma_addr_t req_dma; 247 dma_addr_t req_dma;
244 248
245 req_dma = pci_map_single(ha->pdev, cmd->request_buffer, 249 req_dma = pci_map_single(ha->pdev, cmd->request_buffer,
246 cmd->request_bufflen, 250 cmd->request_bufflen,
247 cmd->sc_data_direction); 251 cmd->sc_data_direction);
248 if (dma_mapping_error(req_dma)) 252 if (dma_mapping_error(req_dma))
249 goto queuing_error; 253 goto queuing_error;
250 254
diff --git a/drivers/scsi/qla4xxx/ql4_nvram.c b/drivers/scsi/qla4xxx/ql4_nvram.c
index 58afd135aa1d..7fe0482ecf03 100644
--- a/drivers/scsi/qla4xxx/ql4_nvram.c
+++ b/drivers/scsi/qla4xxx/ql4_nvram.c
@@ -6,6 +6,9 @@
6 */ 6 */
7 7
8#include "ql4_def.h" 8#include "ql4_def.h"
9#include "ql4_glbl.h"
10#include "ql4_dbg.h"
11#include "ql4_inline.h"
9 12
10static inline void eeprom_cmd(uint32_t cmd, struct scsi_qla_host *ha) 13static inline void eeprom_cmd(uint32_t cmd, struct scsi_qla_host *ha)
11{ 14{
diff --git a/drivers/scsi/qla4xxx/ql4_version.h b/drivers/scsi/qla4xxx/ql4_version.h
index e5183a697d1f..2149069689bd 100644
--- a/drivers/scsi/qla4xxx/ql4_version.h
+++ b/drivers/scsi/qla4xxx/ql4_version.h
@@ -5,4 +5,5 @@
5 * See LICENSE.qla4xxx for copyright and licensing details. 5 * See LICENSE.qla4xxx for copyright and licensing details.
6 */ 6 */
7 7
8#define QLA4XXX_DRIVER_VERSION "5.00.07-k1" 8#define QLA4XXX_DRIVER_VERSION "5.01.00-k7"
9