diff options
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_def.h')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_def.h | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index 4bd67e9c2840..4c67494e9f75 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h | |||
@@ -1523,8 +1523,6 @@ typedef struct fc_port { | |||
1523 | 1523 | ||
1524 | unsigned int os_target_id; | 1524 | unsigned int os_target_id; |
1525 | 1525 | ||
1526 | uint16_t iodesc_idx_sent; | ||
1527 | |||
1528 | int port_login_retry_count; | 1526 | int port_login_retry_count; |
1529 | int login_retry; | 1527 | int login_retry; |
1530 | atomic_t port_down_timer; | 1528 | atomic_t port_down_timer; |
@@ -1940,34 +1938,6 @@ struct sns_cmd_pkt { | |||
1940 | } p; | 1938 | } p; |
1941 | }; | 1939 | }; |
1942 | 1940 | ||
1943 | /* IO descriptors */ | ||
1944 | #define MAX_IO_DESCRIPTORS 32 | ||
1945 | |||
1946 | #define ABORT_IOCB_CB 0 | ||
1947 | #define ADISC_PORT_IOCB_CB 1 | ||
1948 | #define LOGOUT_PORT_IOCB_CB 2 | ||
1949 | #define LOGIN_PORT_IOCB_CB 3 | ||
1950 | #define LAST_IOCB_CB 4 | ||
1951 | |||
1952 | #define IODESC_INVALID_INDEX 0xFFFF | ||
1953 | #define IODESC_ADISC_NEEDED 0xFFFE | ||
1954 | #define IODESC_LOGIN_NEEDED 0xFFFD | ||
1955 | |||
1956 | struct io_descriptor { | ||
1957 | uint16_t used:1; | ||
1958 | uint16_t idx:11; | ||
1959 | uint16_t cb_idx:4; | ||
1960 | |||
1961 | struct timer_list timer; | ||
1962 | |||
1963 | struct scsi_qla_host *ha; | ||
1964 | |||
1965 | port_id_t d_id; | ||
1966 | fc_port_t *remote_fcport; | ||
1967 | |||
1968 | uint32_t signature; | ||
1969 | }; | ||
1970 | |||
1971 | struct qla_fw_info { | 1941 | struct qla_fw_info { |
1972 | unsigned short addressing; /* addressing method used to load fw */ | 1942 | unsigned short addressing; /* addressing method used to load fw */ |
1973 | #define FW_INFO_ADDR_NORMAL 0 | 1943 | #define FW_INFO_ADDR_NORMAL 0 |
@@ -2271,10 +2241,6 @@ typedef struct scsi_qla_host { | |||
2271 | 2241 | ||
2272 | /* Fibre Channel Device List. */ | 2242 | /* Fibre Channel Device List. */ |
2273 | struct list_head fcports; | 2243 | struct list_head fcports; |
2274 | struct list_head rscn_fcports; | ||
2275 | |||
2276 | struct io_descriptor io_descriptors[MAX_IO_DESCRIPTORS]; | ||
2277 | uint16_t iodesc_signature; | ||
2278 | 2244 | ||
2279 | /* RSCN queue. */ | 2245 | /* RSCN queue. */ |
2280 | uint32_t rscn_queue[MAX_RSCN_COUNT]; | 2246 | uint32_t rscn_queue[MAX_RSCN_COUNT]; |
@@ -2313,9 +2279,6 @@ typedef struct scsi_qla_host { | |||
2313 | init_cb_t *init_cb; | 2279 | init_cb_t *init_cb; |
2314 | int init_cb_size; | 2280 | int init_cb_size; |
2315 | 2281 | ||
2316 | dma_addr_t iodesc_pd_dma; | ||
2317 | port_database_t *iodesc_pd; | ||
2318 | |||
2319 | /* These are used by mailbox operations. */ | 2282 | /* These are used by mailbox operations. */ |
2320 | volatile uint16_t mailbox_out[MAILBOX_REGISTER_COUNT]; | 2283 | volatile uint16_t mailbox_out[MAILBOX_REGISTER_COUNT]; |
2321 | 2284 | ||