diff options
Diffstat (limited to 'include/rdma')
-rw-r--r-- | include/rdma/ib_cache.h | 2 | ||||
-rw-r--r-- | include/rdma/ib_cm.h | 2 | ||||
-rw-r--r-- | include/rdma/ib_fmr_pool.h | 4 | ||||
-rw-r--r-- | include/rdma/ib_mad.h | 17 | ||||
-rw-r--r-- | include/rdma/ib_pack.h | 2 | ||||
-rw-r--r-- | include/rdma/ib_sa.h | 2 | ||||
-rw-r--r-- | include/rdma/ib_smi.h | 4 | ||||
-rw-r--r-- | include/rdma/ib_user_cm.h | 2 | ||||
-rw-r--r-- | include/rdma/ib_user_mad.h | 2 | ||||
-rw-r--r-- | include/rdma/ib_user_verbs.h | 2 | ||||
-rw-r--r-- | include/rdma/ib_verbs.h | 6 | ||||
-rw-r--r-- | include/rdma/iw_cm.h | 2 | ||||
-rw-r--r-- | include/rdma/rdma_cm.h | 10 |
13 files changed, 17 insertions, 40 deletions
diff --git a/include/rdma/ib_cache.h b/include/rdma/ib_cache.h index f179d233ffc3..00a2b8ec327f 100644 --- a/include/rdma/ib_cache.h +++ b/include/rdma/ib_cache.h | |||
@@ -30,8 +30,6 @@ | |||
30 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | 30 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN |
31 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | 31 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
32 | * SOFTWARE. | 32 | * SOFTWARE. |
33 | * | ||
34 | * $Id: ib_cache.h 1349 2004-12-16 21:09:43Z roland $ | ||
35 | */ | 33 | */ |
36 | 34 | ||
37 | #ifndef _IB_CACHE_H | 35 | #ifndef _IB_CACHE_H |
diff --git a/include/rdma/ib_cm.h b/include/rdma/ib_cm.h index a627c8682d2f..ec7c6d99ed3f 100644 --- a/include/rdma/ib_cm.h +++ b/include/rdma/ib_cm.h | |||
@@ -31,8 +31,6 @@ | |||
31 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | 31 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN |
32 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | 32 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
33 | * SOFTWARE. | 33 | * SOFTWARE. |
34 | * | ||
35 | * $Id: ib_cm.h 4311 2005-12-05 18:42:01Z sean.hefty $ | ||
36 | */ | 34 | */ |
37 | #if !defined(IB_CM_H) | 35 | #if !defined(IB_CM_H) |
38 | #define IB_CM_H | 36 | #define IB_CM_H |
diff --git a/include/rdma/ib_fmr_pool.h b/include/rdma/ib_fmr_pool.h index 00dadbf94e1d..f62b842e6596 100644 --- a/include/rdma/ib_fmr_pool.h +++ b/include/rdma/ib_fmr_pool.h | |||
@@ -29,8 +29,6 @@ | |||
29 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | 29 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN |
30 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | 30 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
31 | * SOFTWARE. | 31 | * SOFTWARE. |
32 | * | ||
33 | * $Id: ib_fmr_pool.h 2730 2005-06-28 16:43:03Z sean.hefty $ | ||
34 | */ | 32 | */ |
35 | 33 | ||
36 | #if !defined(IB_FMR_POOL_H) | 34 | #if !defined(IB_FMR_POOL_H) |
@@ -61,7 +59,7 @@ struct ib_fmr_pool_param { | |||
61 | int pool_size; | 59 | int pool_size; |
62 | int dirty_watermark; | 60 | int dirty_watermark; |
63 | void (*flush_function)(struct ib_fmr_pool *pool, | 61 | void (*flush_function)(struct ib_fmr_pool *pool, |
64 | void * arg); | 62 | void *arg); |
65 | void *flush_arg; | 63 | void *flush_arg; |
66 | unsigned cache:1; | 64 | unsigned cache:1; |
67 | }; | 65 | }; |
diff --git a/include/rdma/ib_mad.h b/include/rdma/ib_mad.h index 7228c056b9e9..5f6c40fffcf4 100644 --- a/include/rdma/ib_mad.h +++ b/include/rdma/ib_mad.h | |||
@@ -32,11 +32,9 @@ | |||
32 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | 32 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN |
33 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | 33 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
34 | * SOFTWARE. | 34 | * SOFTWARE. |
35 | * | ||
36 | * $Id: ib_mad.h 5596 2006-03-03 01:00:07Z sean.hefty $ | ||
37 | */ | 35 | */ |
38 | 36 | ||
39 | #if !defined( IB_MAD_H ) | 37 | #if !defined(IB_MAD_H) |
40 | #define IB_MAD_H | 38 | #define IB_MAD_H |
41 | 39 | ||
42 | #include <linux/list.h> | 40 | #include <linux/list.h> |
@@ -194,8 +192,7 @@ struct ib_vendor_mad { | |||
194 | u8 data[IB_MGMT_VENDOR_DATA]; | 192 | u8 data[IB_MGMT_VENDOR_DATA]; |
195 | }; | 193 | }; |
196 | 194 | ||
197 | struct ib_class_port_info | 195 | struct ib_class_port_info { |
198 | { | ||
199 | u8 base_version; | 196 | u8 base_version; |
200 | u8 class_version; | 197 | u8 class_version; |
201 | __be16 capability_mask; | 198 | __be16 capability_mask; |
@@ -614,11 +611,11 @@ int ib_process_mad_wc(struct ib_mad_agent *mad_agent, | |||
614 | * any class specific header, and MAD data area. | 611 | * any class specific header, and MAD data area. |
615 | * If @rmpp_active is set, the RMPP header will be initialized for sending. | 612 | * If @rmpp_active is set, the RMPP header will be initialized for sending. |
616 | */ | 613 | */ |
617 | struct ib_mad_send_buf * ib_create_send_mad(struct ib_mad_agent *mad_agent, | 614 | struct ib_mad_send_buf *ib_create_send_mad(struct ib_mad_agent *mad_agent, |
618 | u32 remote_qpn, u16 pkey_index, | 615 | u32 remote_qpn, u16 pkey_index, |
619 | int rmpp_active, | 616 | int rmpp_active, |
620 | int hdr_len, int data_len, | 617 | int hdr_len, int data_len, |
621 | gfp_t gfp_mask); | 618 | gfp_t gfp_mask); |
622 | 619 | ||
623 | /** | 620 | /** |
624 | * ib_is_mad_class_rmpp - returns whether given management class | 621 | * ib_is_mad_class_rmpp - returns whether given management class |
diff --git a/include/rdma/ib_pack.h b/include/rdma/ib_pack.h index f926020d6331..d7fc45c4eba9 100644 --- a/include/rdma/ib_pack.h +++ b/include/rdma/ib_pack.h | |||
@@ -28,8 +28,6 @@ | |||
28 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | 28 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN |
29 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | 29 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
30 | * SOFTWARE. | 30 | * SOFTWARE. |
31 | * | ||
32 | * $Id: ib_pack.h 1349 2004-12-16 21:09:43Z roland $ | ||
33 | */ | 31 | */ |
34 | 32 | ||
35 | #ifndef IB_PACK_H | 33 | #ifndef IB_PACK_H |
diff --git a/include/rdma/ib_sa.h b/include/rdma/ib_sa.h index 942692b0b92e..3841c1aff692 100644 --- a/include/rdma/ib_sa.h +++ b/include/rdma/ib_sa.h | |||
@@ -30,8 +30,6 @@ | |||
30 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | 30 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN |
31 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | 31 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
32 | * SOFTWARE. | 32 | * SOFTWARE. |
33 | * | ||
34 | * $Id: ib_sa.h 2811 2005-07-06 18:11:43Z halr $ | ||
35 | */ | 33 | */ |
36 | 34 | ||
37 | #ifndef IB_SA_H | 35 | #ifndef IB_SA_H |
diff --git a/include/rdma/ib_smi.h b/include/rdma/ib_smi.h index f29af135ba83..aaca0878668f 100644 --- a/include/rdma/ib_smi.h +++ b/include/rdma/ib_smi.h | |||
@@ -32,11 +32,9 @@ | |||
32 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | 32 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN |
33 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | 33 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
34 | * SOFTWARE. | 34 | * SOFTWARE. |
35 | * | ||
36 | * $Id: ib_smi.h 1389 2004-12-27 22:56:47Z roland $ | ||
37 | */ | 35 | */ |
38 | 36 | ||
39 | #if !defined( IB_SMI_H ) | 37 | #if !defined(IB_SMI_H) |
40 | #define IB_SMI_H | 38 | #define IB_SMI_H |
41 | 39 | ||
42 | #include <rdma/ib_mad.h> | 40 | #include <rdma/ib_mad.h> |
diff --git a/include/rdma/ib_user_cm.h b/include/rdma/ib_user_cm.h index 37650afb982c..bd3d380781e0 100644 --- a/include/rdma/ib_user_cm.h +++ b/include/rdma/ib_user_cm.h | |||
@@ -29,8 +29,6 @@ | |||
29 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | 29 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN |
30 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | 30 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
31 | * SOFTWARE. | 31 | * SOFTWARE. |
32 | * | ||
33 | * $Id: ib_user_cm.h 4019 2005-11-11 00:33:09Z sean.hefty $ | ||
34 | */ | 32 | */ |
35 | 33 | ||
36 | #ifndef IB_USER_CM_H | 34 | #ifndef IB_USER_CM_H |
diff --git a/include/rdma/ib_user_mad.h b/include/rdma/ib_user_mad.h index 29d2c7205a90..d6fce1cbdb90 100644 --- a/include/rdma/ib_user_mad.h +++ b/include/rdma/ib_user_mad.h | |||
@@ -29,8 +29,6 @@ | |||
29 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | 29 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN |
30 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | 30 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
31 | * SOFTWARE. | 31 | * SOFTWARE. |
32 | * | ||
33 | * $Id: ib_user_mad.h 2814 2005-07-06 19:14:09Z halr $ | ||
34 | */ | 32 | */ |
35 | 33 | ||
36 | #ifndef IB_USER_MAD_H | 34 | #ifndef IB_USER_MAD_H |
diff --git a/include/rdma/ib_user_verbs.h b/include/rdma/ib_user_verbs.h index 8d65bf0a625b..885254f20bb3 100644 --- a/include/rdma/ib_user_verbs.h +++ b/include/rdma/ib_user_verbs.h | |||
@@ -31,8 +31,6 @@ | |||
31 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | 31 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN |
32 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | 32 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
33 | * SOFTWARE. | 33 | * SOFTWARE. |
34 | * | ||
35 | * $Id: ib_user_verbs.h 4019 2005-11-11 00:33:09Z sean.hefty $ | ||
36 | */ | 34 | */ |
37 | 35 | ||
38 | #ifndef IB_USER_VERBS_H | 36 | #ifndef IB_USER_VERBS_H |
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 31d30b1852e8..5f5621bf70bd 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h | |||
@@ -34,8 +34,6 @@ | |||
34 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | 34 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN |
35 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | 35 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
36 | * SOFTWARE. | 36 | * SOFTWARE. |
37 | * | ||
38 | * $Id: ib_verbs.h 1349 2004-12-16 21:09:43Z roland $ | ||
39 | */ | 37 | */ |
40 | 38 | ||
41 | #if !defined(IB_VERBS_H) | 39 | #if !defined(IB_VERBS_H) |
@@ -777,7 +775,7 @@ struct ib_cq { | |||
777 | struct ib_uobject *uobject; | 775 | struct ib_uobject *uobject; |
778 | ib_comp_handler comp_handler; | 776 | ib_comp_handler comp_handler; |
779 | void (*event_handler)(struct ib_event *, void *); | 777 | void (*event_handler)(struct ib_event *, void *); |
780 | void * cq_context; | 778 | void *cq_context; |
781 | int cqe; | 779 | int cqe; |
782 | atomic_t usecnt; /* count number of work queues */ | 780 | atomic_t usecnt; /* count number of work queues */ |
783 | }; | 781 | }; |
@@ -883,7 +881,7 @@ struct ib_dma_mapping_ops { | |||
883 | void (*sync_single_for_cpu)(struct ib_device *dev, | 881 | void (*sync_single_for_cpu)(struct ib_device *dev, |
884 | u64 dma_handle, | 882 | u64 dma_handle, |
885 | size_t size, | 883 | size_t size, |
886 | enum dma_data_direction dir); | 884 | enum dma_data_direction dir); |
887 | void (*sync_single_for_device)(struct ib_device *dev, | 885 | void (*sync_single_for_device)(struct ib_device *dev, |
888 | u64 dma_handle, | 886 | u64 dma_handle, |
889 | size_t size, | 887 | size_t size, |
diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h index aeefa9b740dc..cbb822e8d791 100644 --- a/include/rdma/iw_cm.h +++ b/include/rdma/iw_cm.h | |||
@@ -62,7 +62,7 @@ struct iw_cm_event { | |||
62 | struct sockaddr_in remote_addr; | 62 | struct sockaddr_in remote_addr; |
63 | void *private_data; | 63 | void *private_data; |
64 | u8 private_data_len; | 64 | u8 private_data_len; |
65 | void* provider_data; | 65 | void *provider_data; |
66 | }; | 66 | }; |
67 | 67 | ||
68 | /** | 68 | /** |
diff --git a/include/rdma/rdma_cm.h b/include/rdma/rdma_cm.h index d8f9a95541c0..22bb2e7bab1a 100644 --- a/include/rdma/rdma_cm.h +++ b/include/rdma/rdma_cm.h | |||
@@ -61,11 +61,11 @@ enum rdma_cm_event_type { | |||
61 | }; | 61 | }; |
62 | 62 | ||
63 | enum rdma_port_space { | 63 | enum rdma_port_space { |
64 | RDMA_PS_SDP = 0x0001, | 64 | RDMA_PS_SDP = 0x0001, |
65 | RDMA_PS_IPOIB= 0x0002, | 65 | RDMA_PS_IPOIB = 0x0002, |
66 | RDMA_PS_TCP = 0x0106, | 66 | RDMA_PS_TCP = 0x0106, |
67 | RDMA_PS_UDP = 0x0111, | 67 | RDMA_PS_UDP = 0x0111, |
68 | RDMA_PS_SCTP = 0x0183 | 68 | RDMA_PS_SCTP = 0x0183 |
69 | }; | 69 | }; |
70 | 70 | ||
71 | struct rdma_addr { | 71 | struct rdma_addr { |