From a64f7583d7cb631c84e3b098d08070fb066ed76e Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 28 Sep 2012 12:00:34 -0700 Subject: [PATCH] refresh --- meta | 7 +++---- patches/refresh-temp | 30 ------------------------------ patches/verbs-ext | 16 +++++----------- 3 files changed, 8 insertions(+), 45 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 63cff98..efd8ed3 100644 --- a/meta +++ b/meta @@ -1,9 +1,8 @@ Version: 1 -Previous: 1d8ccf8ad4fec857a83104af23e406f467b58702 -Head: c9fd7a7a7905fee7d6f6a5e1a05e218b8f2738f3 +Previous: a85dc63d48dfb69acde1e7684d2348907c5a0b79 +Head: e3d312ae562579568c8941c4a9851a8b210eb70f Applied: - verbs-ext: cfb0645e1679677e62e35602dd141386ff660f17 - refresh-temp: c9fd7a7a7905fee7d6f6a5e1a05e218b8f2738f3 + verbs-ext: e3d312ae562579568c8941c4a9851a8b210eb70f Unapplied: xrcd: c0e1b17313d0153cf6debedd6f04700b5b9e47b1 srq_ex: 556e5c240973dd4d4fac250694525ab3211bd604 diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index b078c32..0000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,30 +0,0 @@ -Bottom: ff25a98f5caa5889dfa52d7e2a6a9aa3e69b3ee5 -Top: 815e29364f4b5792b68b75427a1c7c571ed0a27f -Author: Sean Hefty -Date: 2012-09-28 12:00:34 -0700 - -Refresh of verbs-ext - ---- - -diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h -index d944680..b196b83 100644 ---- a/include/infiniband/verbs.h -+++ b/include/infiniband/verbs.h -@@ -732,15 +732,9 @@ enum verbs_context_mask { - }; - - struct verbs_context { -- -- /* "grows up" - new fields go here -- int (*drv_new_func1) (); new corresponding provider call of func1 -- int (*lib_new_func1) (); New library call func1 -- */ -+ /* "grows up" - new fields go here */ - uint64_t has_comp_mask; -- size_t sz; /* Set by library on struct allocation,must be -- * located right before struct ibv_context -- */ -+ size_t sz; /* Must be immediately before struct ibv_context */ - struct ibv_context context;/* Must be last field in the struct */ - }; diff --git a/patches/verbs-ext b/patches/verbs-ext index 6f98d31..1c587e9 100644 --- a/patches/verbs-ext +++ b/patches/verbs-ext @@ -1,5 +1,5 @@ Bottom: 3441ce7abc8e145f2eb9ef7110fe2a69010bd8f6 -Top: ff25a98f5caa5889dfa52d7e2a6a9aa3e69b3ee5 +Top: 815e29364f4b5792b68b75427a1c7c571ed0a27f Author: Yishai Hadas Date: 2012-08-26 16:43:30 +0300 @@ -43,7 +43,7 @@ index 9a81416..f22f287 100644 size_t cmd_size, struct ibv_get_context_resp *resp, size_t resp_size); diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h -index 6acfc81..d944680 100644 +index 6acfc81..b196b83 100644 --- a/include/infiniband/verbs.h +++ b/include/infiniband/verbs.h @@ -38,6 +38,7 @@ @@ -92,7 +92,7 @@ index 6acfc81..d944680 100644 struct ibv_context_ops { int (*query_device)(struct ibv_context *context, struct ibv_device_attr *device_attr); -@@ -702,6 +727,37 @@ struct ibv_context { +@@ -702,6 +727,31 @@ struct ibv_context { void *abi_compat; }; @@ -101,15 +101,9 @@ index 6acfc81..d944680 100644 +}; + +struct verbs_context { -+ -+ /* "grows up" - new fields go here -+ int (*drv_new_func1) (); new corresponding provider call of func1 -+ int (*lib_new_func1) (); New library call func1 -+ */ ++ /* "grows up" - new fields go here */ + uint64_t has_comp_mask; -+ size_t sz; /* Set by library on struct allocation,must be -+ * located right before struct ibv_context -+ */ ++ size_t sz; /* Must be immediately before struct ibv_context */ + struct ibv_context context;/* Must be last field in the struct */ +}; + -- 2.46.0