diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-08-10 21:34:18 +0300 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-08-10 21:34:18 +0300 |
| commit | d0d62c34fb746eaf68df5b3d6f4877c7d1e6320c (patch) | |
| tree | 8ce9d1f42907ff6b9455b155ca47ebae143f9a1b /include/rdma/ib_verbs.h | |
| parent | 320438301b85038e995b5a40a24c43cbc0ed4909 (diff) | |
| parent | db14dff1743e4cd3d840950ad8d735b8957aaf6a (diff) | |
| download | linux-d0d62c34fb746eaf68df5b3d6f4877c7d1e6320c.tar.xz | |
Merge branch 'rdma-netlink' into k.o/merge-test
Conflicts:
include/rdma/ib_verbs.h - Modified a function signature adjacent
to a newly added function signature from a previous merge
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'include/rdma/ib_verbs.h')
| -rw-r--r-- | include/rdma/ib_verbs.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 5ca3ac1e9113..4db4ad56ace6 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -64,6 +64,8 @@ #include <linux/cgroup_rdma.h> #include <uapi/rdma/ib_user_verbs.h> +#define IB_FW_VERSION_NAME_MAX ETHTOOL_FWVERS_LEN + extern struct workqueue_struct *ib_wq; extern struct workqueue_struct *ib_comp_wq; @@ -2298,6 +2300,8 @@ struct ib_device { struct rdmacg_device cg_device; #endif + u32 index; + /** * The following mandatory functions are used only at device * registration. Keep functions such as these at the end of this @@ -2305,7 +2309,7 @@ struct ib_device { * in fast paths. */ int (*get_port_immutable)(struct ib_device *, u8, struct ib_port_immutable *); - void (*get_dev_fw_str)(struct ib_device *, char *str, size_t str_len); + void (*get_dev_fw_str)(struct ib_device *, char *str); const struct cpumask *(*get_vector_affinity)(struct ib_device *ibdev, int comp_vector); }; @@ -2343,7 +2347,7 @@ struct ib_client { struct ib_device *ib_alloc_device(size_t size); void ib_dealloc_device(struct ib_device *device); -void ib_get_device_fw_str(struct ib_device *device, char *str, size_t str_len); +void ib_get_device_fw_str(struct ib_device *device, char *str); int ib_register_device(struct ib_device *device, int (*port_callback)(struct ib_device *, |