refresh

diff --git a/meta b/meta
index ec6bfbcace05ccfcb2b64293fd73f404df422267..182054134dbcfa978a53cdd41db1aa76e2308696 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 04264506b54cb17527ad50545b4d92ef8b7a56d9
-Head: 7fea9647d0d8c2d10ce8b0afecfe96955e201d61
+Previous: e4c3a473d75c42bdc1c00c2f4d7cc9e930bab872
+Head: 1827739d13302a2a03fb445fa0984a447ad343c4
 Applied:
   verbs-ext: 6fbf2b29ca68fc10b7ee47dc0c09f54db0b32320
   compat-ex: fb8aa3e0b8ed628564d7d774907fd17a72a23522
   xrcd: 71fa003681345f671bdef05c9548263252e949de
   srq_ex: 4533085cc46f8b356d9f1ade0e737acfe744471b
-  xrc_qp: 93639c69b2d1cbe9609942fc288915158feb5b1f
-  refresh-temp: 7fea9647d0d8c2d10ce8b0afecfe96955e201d61
+  xrc_qp: 1827739d13302a2a03fb445fa0984a447ad343c4
 Unapplied:
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 5500b0a..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 8f583ebebe02b65049ba80987c77b2cf41db18bf
-Top:    f41ea5f9d30f07ef1eebc93e4a7a6eef484c20cf
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-17 21:31:51 -0700
-
-Refresh of xrc_qp
-
----
-
-diff --git a/src/verbs.c b/src/verbs.c
-index 2643302..013d45d 100644
---- a/src/verbs.c
-+++ b/src/verbs.c
-@@ -477,7 +477,7 @@ struct ibv_qp *__ibv_create_qp_ex(struct ibv_pd *pd,
-       }
-       if (!context) {
-               errno = EINVAL;
--              return NULL
-+              return NULL;
-       }
- 
-       context_ex = verbs_get_ctx(context);

diff --git a/patches/xrc_qp b/patches/xrc_qp
index 575399db79f8d2fa8dec8ec9ec0d219d515b1212..25a488882964a6c8f6cb3e9f62e483bad97f4b63 100644 (file)
--- a/patches/xrc_qp
+++ b/patches/xrc_qp
@@ -1,5 +1,5 @@
 Bottom: ecd73c3660e5997659016ab06ad2fb0db7c572aa
-Top:    8f583ebebe02b65049ba80987c77b2cf41db18bf
+Top:    f41ea5f9d30f07ef1eebc93e4a7a6eef484c20cf
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-17 16:00:12 -0700
 
@@ -282,7 +282,7 @@ index 92bfabd..9ee1cf2 100644
                
  } IBVERBS_1.0;
 diff --git a/src/verbs.c b/src/verbs.c
-index 2690b29..2643302 100644
+index 2690b29..013d45d 100644
 --- a/src/verbs.c
 +++ b/src/verbs.c
 @@ -462,19 +462,45 @@ int __ibv_destroy_srq(struct ibv_srq *srq)
@@ -307,7 +307,7 @@ index 2690b29..2643302 100644
 +      }
 +      if (!context) {
 +              errno = EINVAL;
-+              return NULL
++              return NULL;
 +      }
 +
 +      context_ex = verbs_get_ctx(context);