tree 5adceeb11682b6ea0ed5df9e817e26e648197c95
parent 20aa65699c4112733770100b7f0cce4ad046405e
author Roland Dreier <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:26:11 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:26:11 -0700

[PATCH] IB: Fix user MAD registrations with class 0

Fix handling of MAD agent registrations with mgmt_class == 0.  In this case
ib_umad should pass a NULL registration request to the MAD core rather than a
request with mgmt_class set to 0.

Signed-off-by: Roland Dreier <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>

 infiniband/core/user_mad.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

Index: drivers/infiniband/core/user_mad.c
===================================================================
--- 290dec28864a12d242c4b82c41a3e462f2aa229d/drivers/infiniband/core/user_mad.c 
 (mode:100644 sha1:54b4f33b0bf93e55d0f4143ea5f24d2bad7a90c5)
+++ 5adceeb11682b6ea0ed5df9e817e26e648197c95/drivers/infiniband/core/user_mad.c 
 (mode:100644 sha1:56b9c2fa2ecccbf99399a6015a1e6f1ee3f7e650)
@@ -389,15 +389,17 @@
        goto out;
 
 found:
-       req.mgmt_class         = ureq.mgmt_class;
-       req.mgmt_class_version = ureq.mgmt_class_version;
-       memcpy(req.method_mask, ureq.method_mask, sizeof req.method_mask);
-       memcpy(req.oui,         ureq.oui,         sizeof req.oui);
+       if (ureq.mgmt_class) {
+               req.mgmt_class         = ureq.mgmt_class;
+               req.mgmt_class_version = ureq.mgmt_class_version;
+               memcpy(req.method_mask, ureq.method_mask, sizeof 
req.method_mask);
+               memcpy(req.oui,         ureq.oui,         sizeof req.oui);
+       }
 
        agent = ib_register_mad_agent(file->port->ib_dev, file->port->port_num,
                                      ureq.qpn ? IB_QPT_GSI : IB_QPT_SMI,
-                                     &req, 0, send_handler, recv_handler,
-                                     file);
+                                     ureq.mgmt_class ? &req : NULL,
+                                     0, send_handler, recv_handler, file);
        if (IS_ERR(agent)) {
                ret = PTR_ERR(agent);
                goto out;
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to