[openib-general] ib_modify_qp() too many arguments

[Grant Grundler]

Roland,
I am trying to build roland-merge #1119 on top of 2.6.10-rc1 for ia64.
And yes, the usage noted below doesn't match the declaration:

  CC [M]  drivers/infiniband/core/cm_main.o
  In file included from drivers/infiniband/core/cm_main.c:24:
  drivers/infiniband/core/cm_priv.h: In function `ib_cm_qp_modify':
  drivers/infiniband/core/cm_priv.h:183: error: too many arguments to
  function `ib_modify_qp'

Should I not (yet) be enabling CONFIG_INFINIBAND_CM?
Trivial patch appended to "fix". Though I don't know if it's "right"
since it seems ib_cm_qp_modify() could just go away.

thanks,
grant


Index: src/linux-kernel/infiniband/core/cm_priv.h
===================================================================
--- src/linux-kernel/infiniband/core/cm_priv.h	(revision 1116)
+++ src/linux-kernel/infiniband/core/cm_priv.h	(working copy)
@@ -178,9 +178,7 @@
 				  struct ib_qp_attr *attr,
 				  int                attr_mask)
 {
-	struct ib_qp_cap qp_cap;
-
-	return qp ? ib_modify_qp(qp, attr, attr_mask, &qp_cap) : 0;
+	return qp ? ib_modify_qp(qp, attr, attr_mask) : 0;
 }
 
 int ib_cm_timeout_to_jiffies(int timeout);