From 6df3e817311a1766c49b0f7c9b3b39f5834d249a Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 17 Sep 2012 11:35:40 -0700 Subject: [PATCH] refresh --- meta | 7 +++---- patches/compat-ex | 7 ++++--- patches/refresh-temp | 20 -------------------- 3 files changed, 7 insertions(+), 27 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 4a2ca47..79ef56a 100644 --- a/meta +++ b/meta @@ -1,10 +1,9 @@ Version: 1 -Previous: d4793c253d34069986f819f768251f94d22f6d6a -Head: 61841fc8eb45fcc5854429b8e8486ad71d1a5404 +Previous: 6e7a0ca9374f9a079d7087b5e49da1bac40725e0 +Head: 557abc4b28ae5718e51472659778d57b60a1f7e4 Applied: verbs-ext: 6fbf2b29ca68fc10b7ee47dc0c09f54db0b32320 - compat-ex: ed9acc8bcab8e44b5505f7341f7ce6915674a3a3 - refresh-temp: 61841fc8eb45fcc5854429b8e8486ad71d1a5404 + compat-ex: 557abc4b28ae5718e51472659778d57b60a1f7e4 Unapplied: xrcd: 0e21cac2fc216f26a141a34cfb9e6ce5adfcd9f0 Hidden: diff --git a/patches/compat-ex b/patches/compat-ex index 9e390dd..153e0f5 100644 --- a/patches/compat-ex +++ b/patches/compat-ex @@ -1,5 +1,5 @@ Bottom: b2b2b839d978bb240b0641dff8459eaee9553d17 -Top: b17307fc83c62e15af664eff4c06da422fd1e70a +Top: faf904ed19d8b5c82065fbb4a4b16f27fe1ffb85 Author: Sean Hefty Date: 2012-09-12 11:32:27 -0700 @@ -189,10 +189,10 @@ index a2577d8..f3cb2fc 100644 } diff --git a/src/compat-ex.c b/src/compat-ex.c new file mode 100644 -index 0000000..fc5ba96 +index 0000000..d335d70 --- /dev/null +++ b/src/compat-ex.c -@@ -0,0 +1,510 @@ +@@ -0,0 +1,511 @@ +/* + * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2012 Intel Corp., Inc. All rights reserved. @@ -555,6 +555,7 @@ index 0000000..fc5ba96 + return NULL; + } + ++ qp_ex->qp.qp_num = qp_ex->real_qp->qp_num; + return &qp_ex->qp; +} + diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 311459c..0000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,20 +0,0 @@ -Bottom: b17307fc83c62e15af664eff4c06da422fd1e70a -Top: faf904ed19d8b5c82065fbb4a4b16f27fe1ffb85 -Author: Sean Hefty -Date: 2012-09-17 11:35:40 -0700 - -Refresh of compat-ex - ---- - -diff --git a/src/compat-ex.c b/src/compat-ex.c -index fc5ba96..d335d70 100644 ---- a/src/compat-ex.c -+++ b/src/compat-ex.c -@@ -360,6 +360,7 @@ static struct ibv_qp *_ibv_create_qp_ex(struct ibv_pd *pd, struct ibv_qp_init_at - return NULL; - } - -+ qp_ex->qp.qp_num = qp_ex->real_qp->qp_num; - return &qp_ex->qp; - } -- 2.46.0