---

yaml
---
r: 217743
b: refs/heads/master
c: fed1db3
h: refs/heads/master
i:
  217741: 84d1ff8
  217739: 73fb4b4
  217735: be2191c
  217727: 22b7726
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ad330a002ffbc422f32a77398666832f0df8a3d
+refs/heads/master: fed1db33fe85573487a4732d628ac5afdb5dc776

trunk/drivers/infiniband/core/agent.c

@@ -59,8 +59,8 @@ __ib_get_agent_port(struct ib_device *device, int port_num)
 	struct ib_agent_port_private *entry;
 
 	list_for_each_entry(entry, &ib_agent_port_list, port_list) {
-		if (entry->agent[1]->device == device &&
-		    entry->agent[1]->port_num == port_num)
+		if (entry->agent[0]->device == device &&
+		    entry->agent[0]->port_num == port_num)
 			return entry;
 	}
 	return NULL;
@@ -155,16 +155,14 @@ int ib_agent_port_open(struct ib_device *device, int port_num)
 		goto error1;
 	}
 
-	if (rdma_port_get_link_layer(device, port_num) == IB_LINK_LAYER_INFINIBAND) {
-		/* Obtain send only MAD agent for SMI QP */
-		port_priv->agent[0] = ib_register_mad_agent(device, port_num,
-							    IB_QPT_SMI, NULL, 0,
-							    &agent_send_handler,
-							    NULL, NULL);
-		if (IS_ERR(port_priv->agent[0])) {
-			ret = PTR_ERR(port_priv->agent[0]);
-			goto error2;
-		}
+	/* Obtain send only MAD agent for SMI QP */
+	port_priv->agent[0] = ib_register_mad_agent(device, port_num,
+						    IB_QPT_SMI, NULL, 0,
+						    &agent_send_handler,
+						    NULL, NULL);
+	if (IS_ERR(port_priv->agent[0])) {
+		ret = PTR_ERR(port_priv->agent[0]);
+		goto error2;
 	}
 
 	/* Obtain send only MAD agent for GSI QP */
@@ -184,8 +182,7 @@ int ib_agent_port_open(struct ib_device *device, int port_num)
 	return 0;
 
 error3:
-	if (port_priv->agent[0])
-		ib_unregister_mad_agent(port_priv->agent[0]);
+	ib_unregister_mad_agent(port_priv->agent[0]);
 error2:
 	kfree(port_priv);
 error1:
@@ -208,9 +205,7 @@ int ib_agent_port_close(struct ib_device *device, int port_num)
 	spin_unlock_irqrestore(&ib_agent_port_list_lock, flags);
 
 	ib_unregister_mad_agent(port_priv->agent[1]);
-	if (port_priv->agent[0])
-		ib_unregister_mad_agent(port_priv->agent[0]);
-
+	ib_unregister_mad_agent(port_priv->agent[0]);
 	kfree(port_priv);
 	return 0;
 }