[PATCH][2/11] IB: fix vendor MAD deregistration

[Roland Dreier]

From: Shahar Frank <[EMAIL PROTECTED]>

Fix bug when deregistering a vendor class MAD agent.

Signed-off-by: Roland Dreier <[EMAIL PROTECTED]>


--- linux-export.orig/drivers/infiniband/core/mad.c     2005-03-02 
20:26:03.185796628 -0800
+++ linux-export/drivers/infiniband/core/mad.c  2005-03-02 20:26:10.980104746 
-0800
@@ -41,7 +41,6 @@
 #include "smi.h"
 #include "agent.h"
 
-
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_DESCRIPTION("kernel IB MAD API");
 MODULE_AUTHOR("Hal Rosenstock");
@@ -490,6 +489,7 @@
        cancel_mads(mad_agent_priv);
 
        port_priv = mad_agent_priv->qp_info->port_priv;
+
        cancel_delayed_work(&mad_agent_priv->timed_work);
        flush_workqueue(port_priv->wq);
 
@@ -1266,12 +1266,12 @@
        }
 
        port_priv = agent_priv->qp_info->port_priv;
+       mgmt_class = convert_mgmt_class(agent_priv->reg_req->mgmt_class);
        class = port_priv->version[
                        agent_priv->reg_req->mgmt_class_version].class;
        if (!class)
                goto vendor_check;
 
-       mgmt_class = convert_mgmt_class(agent_priv->reg_req->mgmt_class);
        method = class->method_table[mgmt_class];
        if (method) {
                /* Remove any methods for this mad agent */
@@ -1293,16 +1293,21 @@
        }
 
 vendor_check:
+       if (!is_vendor_class(mgmt_class))
+               goto out;
+
+       /* normalize mgmt_class to vendor range 2 */
+       mgmt_class = vendor_class_index(agent_priv->reg_req->mgmt_class);
        vendor = port_priv->version[
                        agent_priv->reg_req->mgmt_class_version].vendor;
+
        if (!vendor)
                goto out;
 
-       mgmt_class = vendor_class_index(agent_priv->reg_req->mgmt_class);
        vendor_class = vendor->vendor_class[mgmt_class];
        if (vendor_class) {
                index = find_vendor_oui(vendor_class, agent_priv->reg_req->oui);
-               if (index == -1)
+               if (index < 0)
                        goto out;
                method = vendor_class->method_table[index];
                if (method) {
--- linux-export.orig/drivers/infiniband/core/mad_priv.h        2005-03-02 
20:26:03.185796628 -0800
+++ linux-export/drivers/infiniband/core/mad_priv.h     2005-03-02 
20:26:10.980104746 -0800
@@ -58,8 +58,8 @@
 #define MAX_MGMT_CLASS         80
 #define MAX_MGMT_VERSION       8
 #define MAX_MGMT_OUI           8
-#define MAX_MGMT_VENDOR_RANGE2 IB_MGMT_CLASS_VENDOR_RANGE2_END - \
-                               IB_MGMT_CLASS_VENDOR_RANGE2_START + 1
+#define MAX_MGMT_VENDOR_RANGE2 (IB_MGMT_CLASS_VENDOR_RANGE2_END - \
+                               IB_MGMT_CLASS_VENDOR_RANGE2_START + 1)
 
 struct ib_mad_list_head {
        struct list_head list;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/