---

yaml
---
r: 59369
b: refs/heads/master
c: 57e4acb
h: refs/heads/master
i:
  59367: 294dfb2
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0cdf6990e992902ae59cbc625d28cb41390f378e
+refs/heads/master: 57e4acb3f63e1d3d74a75613eefde8b2d68164e3

trunk/MAINTAINERS

@@ -370,7 +370,7 @@ P:	Tom Tucker
 M:	tom@opengridcomputing.com
 P:	Steve Wise
 M:	swise@opengridcomputing.com
-L:	general@lists.openfabrics.org
+L:	openib-general@openib.org
 S:	Maintained
 
 AOA (Apple Onboard Audio) ALSA DRIVER
@@ -1395,7 +1395,7 @@ P:	Hoang-Nam Nguyen
 M:	hnguyen@de.ibm.com
 P:	Christoph Raisch
 M:	raisch@de.ibm.com
-L:	general@lists.openfabrics.org
+L:	openib-general@openib.org
 S:	Supported
 
 EMU10K1 SOUND DRIVER
@@ -1849,8 +1849,8 @@ M:	rolandd@cisco.com
 P:	Sean Hefty
 M:	mshefty@ichips.intel.com
 P:	Hal Rosenstock
-M:	hal.rosenstock@gmail.com 
-L:	general@lists.openfabrics.org
+M:	halr@voltaire.com
+L:	openib-general@openib.org
 W:	http://www.openib.org/
 T:	git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
 S:	Supported
@@ -1988,10 +1988,9 @@ M:	jjciarla@raiz.uncu.edu.ar
 S:	Maintained
 
 IPATH DRIVER:
-P:	Arthur Jones
-M:	infinipath@qlogic.com
-L:	general@lists.openfabrics.org
-T:	git git://git.qlogic.com/ipath-linux-2.6
+P:	Bryan O'Sullivan
+M:	support@pathscale.com
+L:	openib-general@openib.org
 S:	Supported
 
 IPMI SUBSYSTEM

trunk/drivers/infiniband/Kconfig

@@ -1,14 +1,14 @@
-menuconfig INFINIBAND
-	tristate "InfiniBand support"
-	depends on PCI || BROKEN
+menu "InfiniBand support"
 	depends on HAS_IOMEM
+
+config INFINIBAND
+	depends on PCI || BROKEN
+	tristate "InfiniBand support"
 	---help---
 	  Core support for InfiniBand (IB).  Make sure to also select
 	  any protocols you wish to use as well as drivers for your
 	  InfiniBand hardware.
 
-if INFINIBAND
-
 config INFINIBAND_USER_MAD
 	tristate "InfiniBand userspace MAD support"
 	depends on INFINIBAND
@@ -20,6 +20,7 @@ config INFINIBAND_USER_MAD
 
 config INFINIBAND_USER_ACCESS
 	tristate "InfiniBand userspace access (verbs and CM)"
+	depends on INFINIBAND
 	---help---
 	  Userspace InfiniBand access support.  This enables the
 	  kernel side of userspace verbs and the userspace
@@ -36,7 +37,7 @@ config INFINIBAND_USER_MEM
 
 config INFINIBAND_ADDR_TRANS
 	bool
-	depends on INET
+	depends on INFINIBAND && INET
 	default y
 
 source "drivers/infiniband/hw/mthca/Kconfig"
@@ -53,4 +54,4 @@ source "drivers/infiniband/ulp/srp/Kconfig"
 
 source "drivers/infiniband/ulp/iser/Kconfig"
 
-endif # INFINIBAND
+endmenu

trunk/drivers/infiniband/core/agent.c

@@ -3,7 +3,7 @@
  * Copyright (c) 2004, 2005 Infinicon Corporation.  All rights reserved.
  * Copyright (c) 2004, 2005 Intel Corporation.  All rights reserved.
  * Copyright (c) 2004, 2005 Topspin Corporation.  All rights reserved.
- * Copyright (c) 2004-2007 Voltaire Corporation.  All rights reserved.
+ * Copyright (c) 2004, 2005 Voltaire Corporation.  All rights reserved.
  * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -34,14 +34,14 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
+ * $Id: agent.c 1389 2004-12-27 22:56:47Z roland $
  */
 
 #include <linux/slab.h>
 #include <linux/string.h>
 
 #include "agent.h"
 #include "smi.h"
-#include "mad_priv.h"
 
 #define SPFX "ib_agent: "
 
@@ -87,13 +87,8 @@ int agent_send_response(struct ib_mad *mad, struct ib_grh *grh,
 	struct ib_mad_send_buf *send_buf;
 	struct ib_ah *ah;
 	int ret;
-	struct ib_mad_send_wr_private *mad_send_wr;
-
-	if (device->node_type == RDMA_NODE_IB_SWITCH)
-		port_priv = ib_get_agent_port(device, 0);
-	else
-		port_priv = ib_get_agent_port(device, port_num);
 
+	port_priv = ib_get_agent_port(device, port_num);
 	if (!port_priv) {
 		printk(KERN_ERR SPFX "Unable to find port agent\n");
 		return -ENODEV;
@@ -118,14 +113,6 @@ int agent_send_response(struct ib_mad *mad, struct ib_grh *grh,
 
 	memcpy(send_buf->mad, mad, sizeof *mad);
 	send_buf->ah = ah;
-
-	if (device->node_type == RDMA_NODE_IB_SWITCH) {
-		mad_send_wr = container_of(send_buf,
-					   struct ib_mad_send_wr_private,
-					   send_buf);
-		mad_send_wr->send_wr.wr.ud.port_num = port_num;
-	}
-
 	if ((ret = ib_post_send_mad(send_buf, NULL))) {
 		printk(KERN_ERR SPFX "ib_post_send_mad error:%d\n", ret);
 		goto err2;