1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h
index 007fa1c9ef1..77513b4dd9a 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.h
+++ b/drivers/scsi/ibmvscsi/ibmvfc.h
@@ -58,9 +58,10 @@
  * 1 for ERP
  * 1 for initialization
  * 1 for NPIV Logout
+ * 2 for BSG passthru
  * 2 for each discovery thread
  */
-#define IBMVFC_NUM_INTERNAL_REQ (1 + 1 + 1 + (disc_threads * 2))
+#define IBMVFC_NUM_INTERNAL_REQ (1 + 1 + 1 + 2 + (disc_threads * 2))
 
 #define IBMVFC_MAD_SUCCESS              0x00
 #define IBMVFC_MAD_NOT_SUPPORTED        0xF1
@@ -466,7 +467,10 @@ struct ibmvfc_passthru_iu {
         u16 error;
         u32 flags;
 #define IBMVFC_FC_ELS           0x01
+#define IBMVFC_FC_CT_IU         0x02
         u32 cancel_key;
+#define IBMVFC_PASSTHRU_CANCEL_KEY      0x80000000
+#define IBMVFC_INTERNAL_CANCEL_KEY      0x80000001
         u32 reserved;
         struct srp_direct_buf cmd;
         struct srp_direct_buf rsp;
@@ -693,6 +697,7 @@ struct ibmvfc_host {
         int disc_buf_sz;
         int log_level;
         struct ibmvfc_discover_targets_buf *disc_buf;
+        struct mutex passthru_mutex;
         int task_set;
         int init_retries;
         int discovery_threads;
@@ -702,6 +707,7 @@ struct ibmvfc_host {
         int delay_init;
         int scan_complete;
         int logged_in;
+        int aborting_passthru;
         int events_to_log;
 #define IBMVFC_AE_LINKUP        0x0001
 #define IBMVFC_AE_LINKDOWN      0x0002