refresh

diff --git a/meta b/meta
index b58c56a1bdfd778e599c951f71a91b8258172838..f984f5883f37f99bf738e264ba7191004df83746 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 71543e58ce7d2a6556c6df8206be666fd22c04e8
-Head: 770733d84489dfe12ba99fd3e0c248df0d267bf6
+Previous: 052c7ac631ea136d54881e1f9940d2cbcb816e11
+Head: cfb0645e1679677e62e35602dd141386ff660f17
 Applied:
-  verbs-ext: 8df4dc427dadd30e829dab908ab70c0e316b4250
-  refresh-temp: 770733d84489dfe12ba99fd3e0c248df0d267bf6
+  verbs-ext: cfb0645e1679677e62e35602dd141386ff660f17
 Unapplied:
   xrcd: f2b48b365d126d1c4bc61b3b3ea1ab9b7f2544f4
   srq_ex: 91fdc5b4aaf078280ff31bd0cf35760a6ae5dd10

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index ffd1ac3..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,10 +0,0 @@
-Bottom: ff25a98f5caa5889dfa52d7e2a6a9aa3e69b3ee5
-Top:    ff25a98f5caa5889dfa52d7e2a6a9aa3e69b3ee5
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-28 10:50:18 -0700
-
-Refresh of verbs-ext
-
----
-
-

diff --git a/patches/verbs-ext b/patches/verbs-ext
index 1b53014cbdb4001dff1f31b56b4dcb5b4b0fcb04..6f98d3198ff155af1245709f54724434c3281a61 100644 (file)
--- a/patches/verbs-ext
+++ b/patches/verbs-ext
@@ -8,34 +8,20 @@ Infrastructure to support verbs extensions
 Infrastructure to support extended verbs capabilities in a forward/backward
 manner.
 
+Support for extensions is determeind by the provider calling
+verbs_register_driver in place of ibv_register_driver.  When
+extensions are enabled, ibverbs sets the current alloc_context /
+free_context device operations to NULL.  These are used to
+indicate that the struct ibv_device may be cast to struct
+verbs_device.
 
-
-
-
-
-
-The general operation as shown in the following pseudo-code:
-
-ibv_open_device()
-{
-       context = device->ops.alloc_context();
-       if (context == -1) {
-               context_ex = malloc(verbs_context + verbs_device->context_size);
-               verbs_device->init_context(context_ex);
-               context_ex->context.abi_compat = -1;
-       }
-}
-
-If the underlying provider supports extensions, it returns -1 from its
-alloc_context() call.  Ibverbs then allocates the ibv_context structure and
-calls into the provider to finish initializing it.
-
-When extensions are supported, the ibv_device structure is embedded in a
-larger verbs_device structure.  Similarly, ibv_context is embedded inside
-a larger verbs_context structure.
+With extensions, ibverbs allocates the ibv_context structure
+and calls into the provider to initialize it.  The init call
+is part of the verbs_device struct.
 
 Signed-off-by: Yishai Hadas <yishaih@mellanox.com>
 Signed-off-by: Tzahi Oved <tzahio@mellanox.com>
+Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 
 ---