git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-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
5b581fb
..
c217723
100644
(file)
--- a/
drivers/infiniband/ulp/srp/ib_srp.h
+++ b/
drivers/infiniband/ulp/srp/ib_srp.h
@@
-87,11
+87,10
@@
struct srp_device {
struct ib_fmr_pool *fmr_pool;
int fmr_page_shift;
int fmr_page_size;
struct ib_fmr_pool *fmr_pool;
int fmr_page_shift;
int fmr_page_size;
- u
nsigned long
fmr_page_mask;
+ u
64
fmr_page_mask;
};
struct srp_host {
};
struct srp_host {
- u8 initiator_port_id[16];
struct srp_device *dev;
u8 port;
struct class_device class_dev;
struct srp_device *dev;
u8 port;
struct class_device class_dev;
@@
-122,6
+121,7
@@
struct srp_target_port {
__be64 id_ext;
__be64 ioc_guid;
__be64 service_id;
__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;
u16 io_class;
struct srp_host *srp_host;
struct Scsi_Host *scsi_host;
@@
-161,7
+161,7
@@
struct srp_target_port {
};
struct srp_iu {
};
struct srp_iu {
-
dma_addr_t
dma;
+
u64
dma;
void *buf;
size_t size;
enum dma_data_direction direction;
void *buf;
size_t size;
enum dma_data_direction direction;