diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-13 15:29:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-13 15:29:07 -0800 |
| commit | fb7ffeb11bb7e9e75dc83ff67a4925c270e0fa3c (patch) | |
| tree | 6344d7a8a8a828f346f8eceb99339f8ba2c63cc1 /include | |
| parent | 69eebed240b32377b9034551f1b8c4ae2774ceb6 (diff) | |
| parent | 95ed644fd12f53c6fc778f3f246974e5fe3a9468 (diff) | |
| download | op-kernel-dev-fb7ffeb11bb7e9e75dc83ff67a4925c270e0fa3c.zip op-kernel-dev-fb7ffeb11bb7e9e75dc83ff67a4925c270e0fa3c.tar.gz | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
Diffstat (limited to 'include')
| -rw-r--r-- | include/rdma/ib_verbs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index a7f4c35..22fc886 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -88,7 +88,6 @@ enum ib_atomic_cap { struct ib_device_attr { u64 fw_ver; - __be64 node_guid; __be64 sys_image_guid; u64 max_mr_size; u64 page_size_cap; @@ -951,6 +950,7 @@ struct ib_device { u64 uverbs_cmd_mask; int uverbs_abi_ver; + __be64 node_guid; u8 node_type; u8 phys_port_cnt; }; |
