1 files changed, 12 insertions, 35 deletions

diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index dc3fd1e8af0..b4d8672a3e4 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -35,7 +35,6 @@
  */
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 #include <rdma/ib_cache.h>
 
 #include "mad_priv.h"
@@ -1597,9 +1596,6 @@ find_mad_agent(struct ib_mad_port_private *port_priv,
                                         mad->mad_hdr.class_version].class;
                         if (!class)
                                 goto out;
-                        if (convert_mgmt_class(mad->mad_hdr.mgmt_class) >=
-                            IB_MGMT_MAX_METHODS)
-                                goto out;
                         method = class->method_table[convert_mgmt_class(
                                                         mad->mad_hdr.mgmt_class)];
                         if (method)
@@ -1842,26 +1838,6 @@ static void ib_mad_complete_recv(struct ib_mad_agent_private *mad_agent_priv,
         }
 }
 
-static bool generate_unmatched_resp(struct ib_mad_private *recv,
-                                    struct ib_mad_private *response)
-{
-        if (recv->mad.mad.mad_hdr.method == IB_MGMT_METHOD_GET ||
-            recv->mad.mad.mad_hdr.method == IB_MGMT_METHOD_SET) {
-                memcpy(response, recv, sizeof *response);
-                response->header.recv_wc.wc = &response->header.wc;
-                response->header.recv_wc.recv_buf.mad = &response->mad.mad;
-                response->header.recv_wc.recv_buf.grh = &response->grh;
-                response->mad.mad.mad_hdr.method = IB_MGMT_METHOD_GET_RESP;
-                response->mad.mad.mad_hdr.status =
-                        cpu_to_be16(IB_MGMT_MAD_STATUS_UNSUPPORTED_METHOD_ATTRIB);
-                if (recv->mad.mad.mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE)
-                        response->mad.mad.mad_hdr.status |= IB_SMP_DIRECTION;
-
-                return true;
-        } else {
-                return false;
-        }
-}
 static void ib_mad_recv_done_handler(struct ib_mad_port_private *port_priv,
                                      struct ib_wc *wc)
 {
@@ -1871,7 +1847,6 @@ static void ib_mad_recv_done_handler(struct ib_mad_port_private *port_priv,
         struct ib_mad_list_head *mad_list;
         struct ib_mad_agent_private *mad_agent;
         int port_num;
-        int ret = IB_MAD_RESULT_SUCCESS;
 
         mad_list = (struct ib_mad_list_head *)(unsigned long)wc->wr_id;
         qp_info = mad_list->mad_queue->qp_info;
@@ -1955,6 +1930,8 @@ static void ib_mad_recv_done_handler(struct ib_mad_port_private *port_priv,
 local:
         /* Give driver "right of first refusal" on incoming MAD */
         if (port_priv->device->process_mad) {
+                int ret;
+
                 ret = port_priv->device->process_mad(port_priv->device, 0,
                                                      port_priv->port_num,
                                                      wc, &recv->grh,
@@ -1982,10 +1959,6 @@ local:
                  * or via recv_handler in ib_mad_complete_recv()
                  */
                 recv = NULL;
-        } else if ((ret & IB_MAD_RESULT_SUCCESS) &&
-                   generate_unmatched_resp(recv, response)) {
-                agent_send_response(&response->mad.mad, &recv->grh, wc,
-                                    port_priv->device, port_num, qp_info->qp->qp_num);
         }
 
 out:
@@ -2004,7 +1977,7 @@ static void adjust_timeout(struct ib_mad_agent_private *mad_agent_priv)
         unsigned long delay;
 
         if (list_empty(&mad_agent_priv->wait_list)) {
-                cancel_delayed_work(&mad_agent_priv->timed_work);
+                __cancel_delayed_work(&mad_agent_priv->timed_work);
         } else {
                 mad_send_wr = list_entry(mad_agent_priv->wait_list.next,
                                          struct ib_mad_send_wr_private,
@@ -2013,11 +1986,13 @@ static void adjust_timeout(struct ib_mad_agent_private *mad_agent_priv)
                 if (time_after(mad_agent_priv->timeout,
                                mad_send_wr->timeout)) {
                         mad_agent_priv->timeout = mad_send_wr->timeout;
+                        __cancel_delayed_work(&mad_agent_priv->timed_work);
                         delay = mad_send_wr->timeout - jiffies;
                         if ((long)delay <= 0)
                                 delay = 1;
-                        mod_delayed_work(mad_agent_priv->qp_info->port_priv->wq,
-                                         &mad_agent_priv->timed_work, delay);
+                        queue_delayed_work(mad_agent_priv->qp_info->
+                                           port_priv->wq,
+                                           &mad_agent_priv->timed_work, delay);
                 }
         }
 }
@@ -2050,9 +2025,11 @@ static void wait_for_response(struct ib_mad_send_wr_private *mad_send_wr)
         list_add(&mad_send_wr->agent_list, list_item);
 
         /* Reschedule a work item if we have a shorter timeout */
-        if (mad_agent_priv->wait_list.next == &mad_send_wr->agent_list)
-                mod_delayed_work(mad_agent_priv->qp_info->port_priv->wq,
-                                 &mad_agent_priv->timed_work, delay);
+        if (mad_agent_priv->wait_list.next == &mad_send_wr->agent_list) {
+                __cancel_delayed_work(&mad_agent_priv->timed_work);
+                queue_delayed_work(mad_agent_priv->qp_info->port_priv->wq,
+                                   &mad_agent_priv->timed_work, delay);
+        }
 }
 
 void ib_reset_mad_timeout(struct ib_mad_send_wr_private *mad_send_wr,