1 files changed, 22 insertions, 12 deletions

diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
index f38d5b118927..57ffa50f509e 100644
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -211,6 +211,8 @@ static void forward_trap(struct mlx4_ib_dev *dev, u8 port_num, struct ib_mad *ma
         if (agent) {
                 send_buf = ib_create_send_mad(agent, qpn, 0, 0, IB_MGMT_MAD_HDR,
                                               IB_MGMT_MAD_DATA, GFP_ATOMIC);
+                if (IS_ERR(send_buf))
+                        return;
                 /*
                  * We rely here on the fact that MLX QPs don't use the
                  * address handle after the send is posted (this is
@@ -311,19 +313,25 @@ int mlx4_ib_mad_init(struct mlx4_ib_dev *dev)
         struct ib_mad_agent *agent;
         int p, q;
         int ret;
+        enum rdma_link_layer ll;
 
-        for (p = 0; p < dev->num_ports; ++p)
+        for (p = 0; p < dev->num_ports; ++p) {
+                ll = rdma_port_get_link_layer(&dev->ib_dev, p + 1);
                 for (q = 0; q <= 1; ++q) {
-                        agent = ib_register_mad_agent(&dev->ib_dev, p + 1,
-                                                      q ? IB_QPT_GSI : IB_QPT_SMI,
-                                                      NULL, 0, send_handler,
-                                                      NULL, NULL);
-                        if (IS_ERR(agent)) {
-                                ret = PTR_ERR(agent);
-                                goto err;
-                        }
-                        dev->send_agent[p][q] = agent;
+                        if (ll == IB_LINK_LAYER_INFINIBAND) {
+                                agent = ib_register_mad_agent(&dev->ib_dev, p + 1,
+                                                              q ? IB_QPT_GSI : IB_QPT_SMI,
+                                                              NULL, 0, send_handler,
+                                                              NULL, NULL);
+                                if (IS_ERR(agent)) {
+                                        ret = PTR_ERR(agent);
+                                        goto err;
+                                }
+                                dev->send_agent[p][q] = agent;
+                        } else
+                                dev->send_agent[p][q] = NULL;
                 }
+        }
 
         return 0;
 
@@ -344,8 +352,10 @@ void mlx4_ib_mad_cleanup(struct mlx4_ib_dev *dev)
         for (p = 0; p < dev->num_ports; ++p) {
                 for (q = 0; q <= 1; ++q) {
                         agent = dev->send_agent[p][q];
-                        dev->send_agent[p][q] = NULL;
-                        ib_unregister_mad_agent(agent);
+                        if (agent) {
+                                dev->send_agent[p][q] = NULL;
+                                ib_unregister_mad_agent(agent);
+                        }
                 }
 
                 if (dev->sm_ah[p])