rpms/libcxgb3/F-12 libcxgb3-1.2.5-verbs-api.patch, NONE, 1.1 libcxgb3.spec, 1.4, 1.5

Doug Ledford dledford at fedoraproject.org
Fri Nov 6 17:48:35 UTC 2009


Author: dledford

Update of /cvs/extras/rpms/libcxgb3/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25490

Modified Files:
	libcxgb3.spec 
Added Files:
	libcxgb3-1.2.5-verbs-api.patch 
Log Message:
* Fri Nov 06 2009 Doug Ledford <dledford at redhat.com> - 1.2.5-2
- Update to libibverbs-1.1.3 API


libcxgb3-1.2.5-verbs-api.patch:
 iwch.h  |   12 ++++++------
 verbs.c |   14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

--- NEW FILE libcxgb3-1.2.5-verbs-api.patch ---
--- libcxgb3-1.2.5/src/verbs.c.api	2009-09-29 14:57:44.000000000 -0400
+++ libcxgb3-1.2.5/src/verbs.c	2009-11-06 12:37:33.172964811 -0500
@@ -108,7 +108,7 @@ int iwch_free_pd(struct ibv_pd *pd)
 
 static struct ibv_mr *__iwch_reg_mr(struct ibv_pd *pd, void *addr,
 				    size_t length, uint64_t hca_va,
-				    enum ibv_access_flags access)
+				    int access)
 {
 	struct iwch_mr *mhp;
 	struct ibv_reg_mr cmd;
@@ -144,7 +144,7 @@ static struct ibv_mr *__iwch_reg_mr(stru
 }
 
 struct ibv_mr *iwch_reg_mr(struct ibv_pd *pd, void *addr,
-			   size_t length, enum ibv_access_flags access)
+			   size_t length, int access)
 {
 	PDBG("%s addr %p length %ld\n", __FUNCTION__, addr, length);
 	return __iwch_reg_mr(pd, addr, length, (uintptr_t) addr, access);
@@ -267,7 +267,7 @@ struct ibv_srq *iwch_create_srq(struct i
 }
 
 int iwch_modify_srq(struct ibv_srq *srq, struct ibv_srq_attr *attr, 
-		    enum ibv_srq_attr_mask attr_mask)
+		    int attr_mask)
 {
 	return -ENOSYS;
 }
@@ -370,7 +370,7 @@ static void reset_qp(struct iwch_qp *qhp
 }
 
 int iwch_modify_qp(struct ibv_qp *ibqp, struct ibv_qp_attr *attr,
-		   enum ibv_qp_attr_mask attr_mask)
+		   int attr_mask)
 {
 	struct ibv_modify_qp cmd;
 	struct iwch_qp *qhp = to_iwch_qp(ibqp);
@@ -424,7 +424,7 @@ int iwch_destroy_qp(struct ibv_qp *ibqp)
 }
 
 int iwch_query_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
-		  enum ibv_qp_attr_mask attr_mask, struct ibv_qp_init_attr *init_attr)
+		  int attr_mask, struct ibv_qp_init_attr *init_attr)
 {
 	return -ENOSYS;
 }
@@ -439,12 +439,12 @@ int iwch_destroy_ah(struct ibv_ah *ah)
 	return -ENOSYS;
 }
 
-int iwch_attach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid)
+int iwch_attach_mcast(struct ibv_qp *qp, const union ibv_gid *gid, uint16_t lid)
 {
 	return -ENOSYS;
 }
 
-int iwch_detach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid)
+int iwch_detach_mcast(struct ibv_qp *qp, const union ibv_gid *gid, uint16_t lid)
 {
 	return -ENOSYS;
 }
--- libcxgb3-1.2.5/src/iwch.h.api	2009-09-29 14:58:25.000000000 -0400
+++ libcxgb3-1.2.5/src/iwch.h	2009-11-06 12:37:19.981089104 -0500
@@ -150,7 +150,7 @@ extern struct ibv_pd *iwch_alloc_pd(stru
 extern int iwch_free_pd(struct ibv_pd *pd);
 
 extern struct ibv_mr *iwch_reg_mr(struct ibv_pd *pd, void *addr,
-				  size_t length, enum ibv_access_flags access);
+				  size_t length, int access);
 extern int iwch_dereg_mr(struct ibv_mr *mr);
 
 struct ibv_cq *iwch_create_cq(struct ibv_context *context, int cqe,
@@ -168,7 +168,7 @@ extern struct ibv_srq *iwch_create_srq(s
 				       struct ibv_srq_init_attr *attr);
 extern int iwch_modify_srq(struct ibv_srq *srq,
 			   struct ibv_srq_attr *attr,
-			   enum ibv_srq_attr_mask mask);
+			   int mask);
 extern int iwch_destroy_srq(struct ibv_srq *srq);
 extern int iwch_post_srq_recv(struct ibv_srq *ibsrq,
 			      struct ibv_recv_wr *wr,
@@ -177,11 +177,11 @@ extern int iwch_post_srq_recv(struct ibv
 extern struct ibv_qp *iwch_create_qp(struct ibv_pd *pd,
 				     struct ibv_qp_init_attr *attr);
 extern int iwch_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
-			  enum ibv_qp_attr_mask attr_mask);
+			  int attr_mask);
 extern int iwch_destroy_qp(struct ibv_qp *qp);
 extern int iwch_query_qp(struct ibv_qp *qp,
 			 struct ibv_qp_attr *attr,
-			 enum ibv_qp_attr_mask attr_mask,
+			 int attr_mask,
 			 struct ibv_qp_init_attr *init_attr);
 extern void iwch_flush_qp(struct iwch_qp *qhp);
 extern int t3a_post_send(struct ibv_qp *ibqp, struct ibv_send_wr *wr,
@@ -195,9 +195,9 @@ extern int t3b_post_recv(struct ibv_qp *
 extern struct ibv_ah *iwch_create_ah(struct ibv_pd *pd,
 			     struct ibv_ah_attr *ah_attr);
 extern int iwch_destroy_ah(struct ibv_ah *ah);
-extern int iwch_attach_mcast(struct ibv_qp *qp, union ibv_gid *gid,
+extern int iwch_attach_mcast(struct ibv_qp *qp, const union ibv_gid *gid,
 			     uint16_t lid);
-extern int iwch_detach_mcast(struct ibv_qp *qp, union ibv_gid *gid,
+extern int iwch_detach_mcast(struct ibv_qp *qp, const union ibv_gid *gid,
 			     uint16_t lid);
 extern void t3b_async_event(struct ibv_async_event *event);
 #ifdef DEBUG


Index: libcxgb3.spec
===================================================================
RCS file: /cvs/extras/rpms/libcxgb3/F-12/libcxgb3.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libcxgb3.spec	28 Oct 2009 15:45:39 -0000	1.4
+++ libcxgb3.spec	6 Nov 2009 17:48:35 -0000	1.5
@@ -1,12 +1,13 @@
 Name: libcxgb3
 Version: 1.2.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Chelsio T3 iWARP HCA Userspace Driver
 Group: System Environment/Libraries
 License: GPLv2 or BSD
 Url: http://www.openfabrics.org/
 Source: http://www.openfabrics.org/downloads/cxgb3/%{name}-%{version}.tar.gz
 Source1: libcxgb3-modprobe.conf
+Patch0: libcxgb3-1.2.5-verbs-api.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libibverbs-devel >= 1.1, libtool
 Obsoletes: %{name}-devel
@@ -24,6 +25,7 @@ Static version of libcxgb3 that may be l
 
 %prep
 %setup -q
+%patch0 -p1 -b .api
 
 %build
 %configure
@@ -51,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Fri Nov 06 2009 Doug Ledford <dledford at redhat.com> - 1.2.5-2
+- Update to libibverbs-1.1.3 API
+
 * Wed Oct 28 2009 Doug Ledford <dledford at redhat.com> - 1.2.5-1
 - Update to latest version
 - Add provides of libibverbs-driver




More information about the fedora-extras-commits mailing list