Bump libibverbs version

Also finish support for modify SRQ verb.

Signed-off-by: Roland Dreier <rolandd@cisco.com>

diff --git a/ChangeLog b/ChangeLog
index 2c6fe347f482f560d866a0d45436a78d02a16c45..4d91c4cd2428fed9be73fd27976ee322c809fd09 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-05  Roland Dreier  <roland@cisco.com>
+
+       * src/cmd.c (ibv_cmd_modify_srq): Add function for marshalling
+       modify SRQ command.
+
 2005-09-29  Roland Dreier  <roland@cisco.com>
 
        * examples/devinfo.c (print_hca_cap): Get rid of formatting of

diff --git a/README b/README
index 777f88b1766114cc200e0d33198e5112e71a24f0..f104ae207e8765d71dd504920e40bbe71b7b7119 100644 (file)
--- a/README
+++ b/README
@@ -98,6 +98,4 @@ necessary permissions to release your work.
 TODO
 ====
 
- * Shared receive queues (SRQs) are not implemented.
- * Multiple CQ event handlers are not implemented.
  * Memory windows (MWs) are not implemented.

diff --git a/configure.in b/configure.in
index 920b640a1d41d566496a7e3f2f08bbd1fa269309..4381ed20c1dcec689def398f90eacb3f375c7f27 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,11 +1,11 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(libibverbs, 1.0-rc3, openib-general@openib.org)
+AC_INIT(libibverbs, 1.0-rc4, openib-general@openib.org)
 AC_CONFIG_SRCDIR([src/ibverbs.h])
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libibverbs, 1.0-rc3)
+AM_INIT_AUTOMAKE(libibverbs, 1.0-rc4)
 
 AM_PROG_LIBTOOL
 

diff --git a/debian/changelog b/debian/changelog
index fd4b3527417807418a0810f04882559caca54d4f..7a9587ef007118fd65d1cce17ace45f98af34a48 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libibverbs (1.0-rc3) unstable; urgency=low
+libibverbs (1.0-rc4) unstable; urgency=low
 
   * Initial Release.  (Closes: #325752)
 

diff --git a/include/infiniband/driver.h b/include/infiniband/driver.h
index e3107513419aeb36f45c7c31bc5523fcf6d9f561..d7a0dce9f1546091f3221455c612ce8326e8dbd5 100644 (file)
--- a/include/infiniband/driver.h
+++ b/include/infiniband/driver.h
@@ -98,6 +98,10 @@ extern int ibv_cmd_create_srq(struct ibv_pd *pd,
                              struct ibv_srq *srq, struct ibv_srq_init_attr *attr,
                              struct ibv_create_srq *cmd, size_t cmd_size,
                              struct ibv_create_srq_resp *resp, size_t resp_size);
+extern int ibv_cmd_modify_srq(struct ibv_srq *srq,
+                             struct ibv_srq_attr *srq_attr,
+                             enum ibv_srq_attr_mask srq_attr_mask,
+                             struct ibv_modify_srq *cmd, size_t cmd_size);
 extern int ibv_cmd_destroy_srq(struct ibv_srq *srq);
 
 extern int ibv_cmd_create_qp(struct ibv_pd *pd,

diff --git a/libibverbs.spec.in b/libibverbs.spec.in
index 1cb0a24ff186b6c65b837da636ab766447d844d0..ba714d7b8ea96b2fafc97225afa94d0da9c64795 100644 (file)
--- a/libibverbs.spec.in
+++ b/libibverbs.spec.in
@@ -4,7 +4,7 @@
 
 Name: libibverbs
 Version: 1.0
-Release: 0.1.rc3%{?dist}
+Release: 0.2.rc4%{?dist}
 Summary: A library for direct userspace use of InfiniBand
 
 Group: System Environment/Libraries
@@ -77,5 +77,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Wed Oct  5 2005 Roland Dreier <roland@cisco.com> - 1.0-0.2-rc4
+- Update to upstream 1.0-rc4 release
+
 * Mon Sep 26 2005 Roland Dreier <roland@cisco.com> - 1.0-0.1.rc3
 - Initial attempt at Fedora Extras-compliant spec file

diff --git a/src/cmd.c b/src/cmd.c
index c56081221e3b723bcc0b41b85257592377ad0893..20284e81232e4e86937125c8b9230a0526c2b1c5 100644 (file)
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -360,6 +360,26 @@ int ibv_cmd_create_srq(struct ibv_pd *pd,
        return 0;
 }
 
+int ibv_cmd_modify_srq(struct ibv_srq *srq,
+                      struct ibv_srq_attr *srq_attr,
+                      enum ibv_srq_attr_mask srq_attr_mask,
+                      struct ibv_modify_srq *cmd, size_t cmd_size)
+{
+       IBV_INIT_CMD(cmd, cmd_size, MODIFY_SRQ);
+
+       cmd->srq_handle = srq->handle;
+       cmd->attr_mask  = srq_attr_mask;
+       cmd->max_wr     = srq_attr->max_wr;
+       cmd->max_sge    = srq_attr->max_sge;
+       cmd->srq_limit  = srq_attr->srq_limit;
+       cmd->reserved   = 0;
+
+       if (write(srq->context->cmd_fd, cmd, cmd_size) != cmd_size)
+               return errno;
+
+       return 0;
+}
+
 static int ibv_cmd_destroy_srq_v1(struct ibv_srq *srq)
 {
        struct ibv_destroy_srq_v1 cmd;