Merge branch 'fixes-merge-window-pt2' into fixes

[linux.git] / drivers / scsi / ibmvscsi / ibmvscsi.h

diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.h b/drivers/scsi/ibmvscsi/ibmvscsi.h
index 6ebd1410488dabdd27e198252810a2d069b91b88..e60916ef7a496df88e8f89a7d2c3265b5254c9d1 100644 (file)
--- a/drivers/scsi/ibmvscsi/ibmvscsi.h
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.h
@@ -74,13 +74,19 @@ struct event_pool {
        dma_addr_t iu_token;
 };
 
+enum ibmvscsi_host_action {
+       IBMVSCSI_HOST_ACTION_NONE = 0,
+       IBMVSCSI_HOST_ACTION_RESET,
+       IBMVSCSI_HOST_ACTION_REENABLE,
+       IBMVSCSI_HOST_ACTION_UNBLOCK,
+};
+
 /* all driver data associated with a host adapter */
 struct ibmvscsi_host_data {
        struct list_head host_list;
        atomic_t request_limit;
        int client_migrated;
-       int reset_crq;
-       int reenable_crq;
+       enum ibmvscsi_host_action action;
        struct device *dev;
        struct event_pool pool;
        struct crq_queue queue;