Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[powerpc.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 033a447..868a540 100644 (file)
--- a/drivers/infiniband/ulp/srp/ib_srp.h
+++ b/drivers/infiniband/ulp/srp/ib_srp.h
@@ -91,7 +91,6 @@ struct srp_device {
 };
 
 struct srp_host {
-       u8                      initiator_port_id[16];
        struct srp_device      *dev;
        u8                      port;
        struct class_device     class_dev;
@@ -122,6 +121,8 @@ struct srp_target_port {
        __be64                  id_ext;
        __be64                  ioc_guid;
        __be64                  service_id;
+       __be64                  initiator_ext;
+       u16                     io_class;
        struct srp_host        *srp_host;
        struct Scsi_Host       *scsi_host;
        char                    target_name[32];
@@ -138,6 +139,8 @@ struct srp_target_port {
        int                     max_ti_iu_len;
        s32                     req_lim;
 
+       int                     zero_req_lim;
+
        unsigned                rx_head;
        struct srp_iu          *rx_ring[SRP_RQ_SIZE];
 
@@ -158,7 +161,7 @@ struct srp_target_port {
 };
 
 struct srp_iu {
-       dma_addr_t              dma;
+       u64                     dma;
        void                   *buf;
        size_t                  size;
        enum dma_data_direction direction;