refresh

diff --git a/meta b/meta
index 87862047894f2021abb1f662f88767efc38ce2c1..6adbecffe9e79e2e914f347cc4a1492f14a9304a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 4d40357b9151a26ebf0fea331e170f35b555f03d
-Head: 4ce5da9964f28af45f30e3be4e05a777289c496c
+Previous: 0c3766491c1cb42487c2b11fb993dca050c86819
+Head: 85bc9242fb5018ea3a7a550e6511bd081938117f
 Applied:
   ext: bd9562c3a152f1aeb3cd985d906fd28d1da11fe1
   xrc: 563fb8c3e4ac4b1bb34706822e65c761cbb918d3
@@ -9,7 +9,6 @@ Applied:
   open_qp: 94332ed744f0a660d7654ddd75619d415c712289
   open-qp-man: ff127a22f2a7e7190bde348b2ed38dd490ecfe20
   ofed: ea0fdc0d9acb6371d6131f7103373f37bfc9bd37
-  pdata: 7565f1408866c5716741c76e04d17d504560487d
-  refresh-temp: 4ce5da9964f28af45f30e3be4e05a777289c496c
+  pdata: 85bc9242fb5018ea3a7a550e6511bd081938117f
 Unapplied:
 Hidden:

diff --git a/patches/pdata b/patches/pdata
index b5759314130ac9e1d385315230a880391505cd0f..6cd704e89843521318969832d99084a04b76dc7a 100644 (file)
--- a/patches/pdata
+++ b/patches/pdata
@@ -1,5 +1,5 @@
 Bottom: 87258c344a755791648258063d6a701efa4ffb61
-Top:    afbd00f600a19c7b7ef17255b8c1cf00caabe11a
+Top:    c2b214245dd89f16f9097c141bbacd65144b496f
 Author: Dotan Barak <dotanb@dev.mellanox.co.il>
 Date:   2012-04-24 11:50:48 -0700
 
@@ -27,7 +27,7 @@ index b03d7ae..841e689 100644
  
  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
+index 1dcd17f..ddc8722 100644
 --- a/include/infiniband/verbs.h
 +++ b/include/infiniband/verbs.h
 @@ -706,7 +706,7 @@ struct ibv_device {
@@ -39,6 +39,15 @@ index 1dcd17f..97c0e35 100644
        int                     (*have_ext_ops)(struct ibv_device *device,
                                                const char *ext_name);
        void *                  (*get_device_ext_ops)(struct ibv_device *device,
+@@ -791,7 +791,7 @@ struct ibv_context {
+       void                   *abi_compat;
+ 
+       /* Following fields only available if device supports extensions */
+-      void                   *private;
++      void                   *private_data;
+       void *                  (*get_ext_ops)(struct ibv_context *context,
+                                              const char *ext_name);
+ };
 diff --git a/src/ofverbs.c b/src/ofverbs.c
 index 0486552..2ee5e81 100644
 --- a/src/ofverbs.c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index a0d391c..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: afbd00f600a19c7b7ef17255b8c1cf00caabe11a
-Top:    c2b214245dd89f16f9097c141bbacd65144b496f
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-04-24 11:58:59 -0700
-
-Refresh of pdata
-
----
-
-diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
-index 97c0e35..ddc8722 100644
---- a/include/infiniband/verbs.h
-+++ b/include/infiniband/verbs.h
-@@ -791,7 +791,7 @@ struct ibv_context {
-       void                   *abi_compat;
- 
-       /* Following fields only available if device supports extensions */
--      void                   *private;
-+      void                   *private_data;
-       void *                  (*get_ext_ops)(struct ibv_context *context,
-                                              const char *ext_name);
- };