refresh

diff --git a/meta b/meta
index 1dda047ac25920818acfc5d7c1625668f6871886..f71489166ad7eea37566fba0a9a5c7449c2418f6 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: e088611ca0f8aebf27af0d5d1cd2e7aa8286690b
-Head: 36fd26acfa091ab4497e09bdb91c5ec35f1d2b41
+Previous: c65f5792d2436ef045e8b9a6873f0b8ef91d0ba7
+Head: 6f5bd9320736c14a35405d30b5bcda552c0a9bc3
 Applied:
-  verbs-ext: 769935938a99d02595d134f4bf71862fe9cc32c2
-  refresh-temp: 36fd26acfa091ab4497e09bdb91c5ec35f1d2b41
+  verbs-ext: 6f5bd9320736c14a35405d30b5bcda552c0a9bc3
 Unapplied:
   xrcd: 5fb0d908fd199cbad61d107b890ef2a597a26c64
   srq_ex: 91529c3d3de6d93f03d70214ec3b57c42e45ee9f

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index e0850b5..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: e043d9f812f335b0a3519b14883777c97d69bd63
-Top:    8f54664c1ae0c2059bd040a5eb02d960e77020b9
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-27 16:02:11 -0700
-
-Refresh of verbs-ext
-
----
-
-diff --git a/src/device.c b/src/device.c
-index 15f8c54..448a243 100644
---- a/src/device.c
-+++ b/src/device.c
-@@ -160,7 +160,7 @@ struct ibv_context *__ibv_open_device(struct ibv_device *device)
-               context_ex->sz = sizeof(*context_ex);
- 
-               context = &context_ex->context;
--              ret = verbs_device->init_context(verbs_device, context; cmd_fd);
-+              ret = verbs_device->init_context(verbs_device, context, cmd_fd);
-               if (ret)
-                       goto verbs_err;

diff --git a/patches/verbs-ext b/patches/verbs-ext
index 787555bf7f06e550162de6de3b77deaea74b5aca..7dd05f2063a83965829bf362fe3c5d0150ee9908 100644 (file)
--- a/patches/verbs-ext
+++ b/patches/verbs-ext
@@ -1,5 +1,5 @@
 Bottom: 3441ce7abc8e145f2eb9ef7110fe2a69010bd8f6
-Top:    e043d9f812f335b0a3519b14883777c97d69bd63
+Top:    8f54664c1ae0c2059bd040a5eb02d960e77020b9
 Author: Yishai Hadas <yishaih@mellanox.com>
 Date:   2012-08-26 16:43:30 +0300
 
@@ -192,7 +192,7 @@ index 9789092..dab8930 100644
        IBV_INIT_CMD_RESP(cmd, cmd_size, GET_CONTEXT, resp, resp_size);
  
 diff --git a/src/device.c b/src/device.c
-index 5798895..15f8c54 100644
+index 5798895..448a243 100644
 --- a/src/device.c
 +++ b/src/device.c
 @@ -124,9 +124,11 @@ default_symver(__ibv_get_device_guid, ibv_get_device_guid);
@@ -232,7 +232,7 @@ index 5798895..15f8c54 100644
 +              context_ex->sz = sizeof(*context_ex);
 +
 +              context = &context_ex->context;
-+              ret = verbs_device->init_context(verbs_device, context; cmd_fd);
++              ret = verbs_device->init_context(verbs_device, context, cmd_fd);
 +              if (ret)
 +                      goto verbs_err;
 +