From 69fab58d51fbb6e99ab3b745a0aed7cc9cbd3b41 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Tue, 24 Apr 2012 11:54:53 -0700
Subject: [PATCH] refresh (create temporary patch)

---
 meta                 |  5 ++--
 patches/refresh-temp | 57 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index 3f0f798..6380155 100644
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 0cfd1c653c69beb5a633ebfefd05163418aff3e1
-Head: 1b2f0e63da829e65a0164419dcc0da1e4872bf07
+Previous: 791de3488bc2dea8660d79a442784c16f3bde512
+Head: b573ff9587387930ec0f3153561435d0fbb8faaa
 Applied:
   ext: bd9562c3a152f1aeb3cd985d906fd28d1da11fe1
   xrc: 563fb8c3e4ac4b1bb34706822e65c761cbb918d3
@@ -10,5 +10,6 @@ Applied:
   open-qp-man: ff127a22f2a7e7190bde348b2ed38dd490ecfe20
   ofed: ea0fdc0d9acb6371d6131f7103373f37bfc9bd37
   pdata: 1b2f0e63da829e65a0164419dcc0da1e4872bf07
+  refresh-temp: b573ff9587387930ec0f3153561435d0fbb8faaa
 Unapplied:
 Hidden:
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 0000000..6157b02
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,57 @@
+Bottom: 87258c344a755791648258063d6a701efa4ffb61
+Top:    afbd00f600a19c7b7ef17255b8c1cf00caabe11a
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-04-24 11:54:53 -0700
+
+Refresh of pdata
+
+---
+
+diff --git a/include/infiniband/ofverbs.h b/include/infiniband/ofverbs.h
+index b03d7ae..841e689 100644
+--- 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 1dcd17f..97c0e35 100644
+--- 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 0486552..2ee5e81 100644
+--- 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);
-- 
2.46.0