refresh

diff --git a/meta b/meta
index cbcb37eafc12dc376fce803f5dd224a35acfb788..b6ce31f2f80ee32739b132ec1bb878857e1d56a6 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: e5fb1543af9766204e585ccfaed0dd7d815dd2eb
-Head: f770da995fb0d67589ddee8d53eef8e48a2c6756
+Previous: 3fc28ef7a65e17b1dc9a5769463dc6874ea8ce37
+Head: 102a2b871dba4b496d019398dd00248c340869f7
 Applied:
   ext: bd9562c3a152f1aeb3cd985d906fd28d1da11fe1
   xrc: 563fb8c3e4ac4b1bb34706822e65c761cbb918d3
@@ -8,7 +8,6 @@ Applied:
   xsrq_sample: 5099ebb63980b28a82fde95e55bed02ea699092e
   open_qp: 94332ed744f0a660d7654ddd75619d415c712289
   open-qp-man: ff127a22f2a7e7190bde348b2ed38dd490ecfe20
-  ofed: aa3eb44158f831aa7fb06d2ceba947bd2c03519d
-  refresh-temp: f770da995fb0d67589ddee8d53eef8e48a2c6756
+  ofed: 102a2b871dba4b496d019398dd00248c340869f7
 Unapplied:
 Hidden:

diff --git a/patches/ofed b/patches/ofed
index 7323cfc9abcc7ea2c6468036c810aa9a115b1a73..c370c61d6cb47ced9d8dfeda3ae6a449f3ad6758 100644 (file)
--- a/patches/ofed
+++ b/patches/ofed
@@ -1,5 +1,5 @@
 Bottom: fd22b1cde9dbc9f53e043079140375fdc38b560b
-Top:    fd22b1cde9dbc9f53e043079140375fdc38b560b
+Top:    80221cbccfbc5378ebfeeeb991764644be408236
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-12-22 00:14:12 -0800
 
@@ -25,4 +25,69 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/Makefile.am b/Makefile.am
+index ee86c70..e1d3ac4 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,7 +11,7 @@ libibverbs_version_script = @LIBIBVERBS_VERSION_SCRIPT@
+ 
+ src_libibverbs_la_SOURCES = src/cmd.c src/compat-1_0.c src/device.c src/init.c \
+                           src/marshall.c src/memory.c src/sysfs.c src/verbs.c \
+-                          src/enum_strs.c
++                          src/enum_strs.c src/ofverbs.c
+ src_libibverbs_la_LDFLAGS = -version-info 1 -export-dynamic \
+     $(libibverbs_version_script)
+ src_libibverbs_la_DEPENDENCIES = $(srcdir)/src/libibverbs.map
+@@ -40,7 +40,8 @@ libibverbsincludedir = $(includedir)/infiniband
+ 
+ libibverbsinclude_HEADERS = include/infiniband/arch.h include/infiniband/driver.h \
+     include/infiniband/kern-abi.h include/infiniband/opcode.h include/infiniband/verbs.h \
+-    include/infiniband/sa-kern-abi.h include/infiniband/sa.h include/infiniband/marshall.h
++    include/infiniband/sa-kern-abi.h include/infiniband/sa.h include/infiniband/marshall.h \
++    include/infiniband/ofverbs.h include/infiniband/ofverbs-defs.h
+ 
+ man_MANS = man/ibv_asyncwatch.1 man/ibv_devices.1 man/ibv_devinfo.1   \
+     man/ibv_rc_pingpong.1 man/ibv_uc_pingpong.1 man/ibv_ud_pingpong.1 \
+diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
+index a499a50..1dcd17f 100644
+--- a/include/infiniband/verbs.h
++++ b/include/infiniband/verbs.h
+@@ -39,6 +39,10 @@
+ #include <stdint.h>
+ #include <pthread.h>
+ 
++#ifdef OFED_VERBS
++#include <infiniband/ofverbs-defs.h>
++#endif /* OFED_VERBS */
++
+ #ifdef __cplusplus
+ #  define BEGIN_C_DECLS extern "C" {
+ #  define END_C_DECLS   }
+@@ -1245,4 +1249,8 @@ END_C_DECLS
+ #  undef __attribute_const
+ 
+ 
++#ifdef OFED_VERBS
++#include <infiniband/ofverbs.h>
++#endif /* OFED_VERBS */
++
+ #endif /* INFINIBAND_VERBS_H */
+diff --git a/src/libibverbs.map b/src/libibverbs.map
+index efd6712..558bc69 100644
+--- a/src/libibverbs.map
++++ b/src/libibverbs.map
+@@ -110,4 +110,14 @@ IBVERBS_1.1 {
+               ibv_create_xsrq;
+               ibv_cmd_open_qp;
+               ibv_open_qp;
++
++              ofv_get_async_event;
++              ofv_ack_async_event;
++              ofv_open_xrc_domain;
++              ofv_close_xrc_domain;
++              ofv_create_xrc_rcv_qp;
++              ofv_modify_xrc_rcv_qp;
++              ofv_query_xrc_rcv_qp;
++              ofv_reg_xrc_rcv_qp;
++              ofv_unreg_xrc_rcv_qp;
+ } IBVERBS_1.0;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 9947bf3..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,75 +0,0 @@
-Bottom: fd22b1cde9dbc9f53e043079140375fdc38b560b
-Top:    80221cbccfbc5378ebfeeeb991764644be408236
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-12-22 00:14:58 -0800
-
-Refresh of ofed
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index ee86c70..e1d3ac4 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -11,7 +11,7 @@ libibverbs_version_script = @LIBIBVERBS_VERSION_SCRIPT@
- 
- src_libibverbs_la_SOURCES = src/cmd.c src/compat-1_0.c src/device.c src/init.c \
-                           src/marshall.c src/memory.c src/sysfs.c src/verbs.c \
--                          src/enum_strs.c
-+                          src/enum_strs.c src/ofverbs.c
- src_libibverbs_la_LDFLAGS = -version-info 1 -export-dynamic \
-     $(libibverbs_version_script)
- src_libibverbs_la_DEPENDENCIES = $(srcdir)/src/libibverbs.map
-@@ -40,7 +40,8 @@ libibverbsincludedir = $(includedir)/infiniband
- 
- libibverbsinclude_HEADERS = include/infiniband/arch.h include/infiniband/driver.h \
-     include/infiniband/kern-abi.h include/infiniband/opcode.h include/infiniband/verbs.h \
--    include/infiniband/sa-kern-abi.h include/infiniband/sa.h include/infiniband/marshall.h
-+    include/infiniband/sa-kern-abi.h include/infiniband/sa.h include/infiniband/marshall.h \
-+    include/infiniband/ofverbs.h include/infiniband/ofverbs-defs.h
- 
- man_MANS = man/ibv_asyncwatch.1 man/ibv_devices.1 man/ibv_devinfo.1   \
-     man/ibv_rc_pingpong.1 man/ibv_uc_pingpong.1 man/ibv_ud_pingpong.1 \
-diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
-index a499a50..1dcd17f 100644
---- a/include/infiniband/verbs.h
-+++ b/include/infiniband/verbs.h
-@@ -39,6 +39,10 @@
- #include <stdint.h>
- #include <pthread.h>
- 
-+#ifdef OFED_VERBS
-+#include <infiniband/ofverbs-defs.h>
-+#endif /* OFED_VERBS */
-+
- #ifdef __cplusplus
- #  define BEGIN_C_DECLS extern "C" {
- #  define END_C_DECLS   }
-@@ -1245,4 +1249,8 @@ END_C_DECLS
- #  undef __attribute_const
- 
- 
-+#ifdef OFED_VERBS
-+#include <infiniband/ofverbs.h>
-+#endif /* OFED_VERBS */
-+
- #endif /* INFINIBAND_VERBS_H */
-diff --git a/src/libibverbs.map b/src/libibverbs.map
-index efd6712..558bc69 100644
---- a/src/libibverbs.map
-+++ b/src/libibverbs.map
-@@ -110,4 +110,14 @@ IBVERBS_1.1 {
-               ibv_create_xsrq;
-               ibv_cmd_open_qp;
-               ibv_open_qp;
-+
-+              ofv_get_async_event;
-+              ofv_ack_async_event;
-+              ofv_open_xrc_domain;
-+              ofv_close_xrc_domain;
-+              ofv_create_xrc_rcv_qp;
-+              ofv_modify_xrc_rcv_qp;
-+              ofv_query_xrc_rcv_qp;
-+              ofv_reg_xrc_rcv_qp;
-+              ofv_unreg_xrc_rcv_qp;
- } IBVERBS_1.0;