tree 1fa7310737e35cacc6b23a0716861ecc142099bd
parent 4147ea7bf00c1c0fa2c6eab4ca35a56bdaa96e03
author Roland Dreier <[EMAIL PROTECTED]> Tue Apr 12 08:26:38 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:26:38 2005
[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]>
user_mad.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
Index: drivers/infiniband/core/user_mad.c
===================================================================
--- 5148edd3438b1bdcdc5bff6751e91799f3217321/drivers/infiniband/core/user_mad.c
(mode:100644 sha1:36bf9cf938de5bee4c30caeaca639a975e69421a)
+++ 1fa7310737e35cacc6b23a0716861ecc142099bd/drivers/infiniband/core/user_mad.c
(mode:100644 sha1:6a04dd62e3d287e6d042bc786639bf68ab9a697c)
@@ -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
