Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...

[sfrench/cifs-2.6.git] / drivers / infiniband / ulp / srp / ib_srp.h

diff --git a/drivers/infiniband/ulp/srp/ib_srp.h b/drivers/infiniband/ulp/srp/ib_srp.h
index 2f3319c719a57a630fd1f39b74ec3c50ceab2a99..cb6eb816024a881061d0ac48c4a423fa118fd2e8 100644 (file)
--- a/drivers/infiniband/ulp/srp/ib_srp.h
+++ b/drivers/infiniband/ulp/srp/ib_srp.h
@@ -54,6 +54,7 @@ enum {
 
        SRP_PORT_REDIRECT       = 1,
        SRP_DLID_REDIRECT       = 2,
+       SRP_STALE_CONN          = 3,
 
        SRP_MAX_LUN             = 512,
        SRP_DEF_SG_TABLESIZE    = 12,
@@ -79,6 +80,11 @@ enum srp_target_state {
        SRP_TARGET_REMOVED
 };
 
+enum srp_request_type {
+       SRP_REQ_NORMAL,
+       SRP_REQ_TASK_MGMT,
+};
+
 struct srp_device {
        struct list_head        dev_list;
        struct ib_device       *dev;
@@ -106,11 +112,6 @@ struct srp_request {
        struct srp_iu          *cmd;
        struct srp_iu          *tsk_mgmt;
        struct ib_pool_fmr     *fmr;
-       /*
-        * Fake scatterlist used when scmnd->use_sg==0.  Can be killed
-        * when the SCSI midlayer no longer generates non-SG commands.
-        */
-       struct scatterlist      fake_sg;
        struct completion       done;
        short                   index;
        u8                      cmd_done;
@@ -129,6 +130,7 @@ struct srp_target_port {
        unsigned int            scsi_id;
 
        struct ib_sa_path_rec   path;
+       __be16                  orig_dgid[8];
        struct ib_sa_query     *path_query;
        int                     path_query_id;