Since "private" is a reserved word in C++, it shouldn't be used as a name of a

structure attribute.

Signed-off-by: Dotan Barak <dotanb@dev.mellanox.co.il>
Reviewed-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: Sean Hefty <sean.hefty@intel.com>

diff --git a/include/infiniband/ofverbs.h b/include/infiniband/ofverbs.h
index b03d7ae2d09794d650396319cfe6836a4a9caf53..841e68928791b1dc5c5dcdafbc6e48e7bac10ed2 100644 (file)
--- a/include/infiniband/ofverbs.h
+++ b/include/infiniband/ofverbs.h
@@ -102,7 +102,7 @@ struct ofv_async_event {
                uint32_t        xrc_qp_num;
        } element;
        enum ibv_event_type     event_type;
-       void                   *private;
+       void                   *private_data;
 };
 
 int ofv_get_async_event(struct ibv_context *context,

diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
index 1dcd17ffb25bbc1ebb52046c9c93f419c6de5a32..97c0e35ab98cd727cd787eb318e8dac06ec543f9 100644 (file)
--- a/include/infiniband/verbs.h
+++ b/include/infiniband/verbs.h
@@ -706,7 +706,7 @@ struct ibv_device {
        char                    ibdev_path[IBV_SYSFS_PATH_MAX];
 
        /* Following fields only available if device supports extensions */
-       void                   *private;
+       void                   *private_data;
        int                     (*have_ext_ops)(struct ibv_device *device,
                                                const char *ext_name);
        void *                  (*get_device_ext_ops)(struct ibv_device *device,

diff --git a/src/ofverbs.c b/src/ofverbs.c
index 0486552dbafbbffa1526f11ba0d6781f31c1c493..2ee5e819756f1299ff4e949da26604e8d9496416 100644 (file)
--- a/src/ofverbs.c
+++ b/src/ofverbs.c
@@ -61,7 +61,7 @@ int __ofv_get_async_event(struct ibv_context *context,
                case IBV_EVENT_PATH_MIG_ERR:
                case IBV_EVENT_QP_LAST_WQE_REACHED:
                        if (event->element.qp->qp_type == IBV_QPT_XRC_RECV) {
-                               event->private = event->element.qp;
+                               event->private_data = event->element.qp;
                                event->event_type |= OFV_XRC_QP_EVENT_FLAG;
                                event->element.xrc_qp_num = event->element.qp->qp_num;
                        }
@@ -76,7 +76,7 @@ default_symver(__ofv_get_async_event, ofv_get_async_event);
 void ofv_ack_async_event(struct ofv_async_event *event)
 {
        if (event->event_type & OFV_XRC_QP_EVENT_FLAG) {
-               event->element.qp = event->private;
+               event->element.qp = event->private_data;
                event->event_type &= ~OFV_XRC_QP_EVENT_FLAG;
        }
        ibv_ack_async_event((struct ibv_async_event *) event);