aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Dreier <roland@topspin.com>2005-04-16 18:26:11 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 18:26:11 -0400
commit0df3bb131f789f5929f7a239869e9945e4a5a734 (patch)
tree5adceeb11682b6ea0ed5df9e817e26e648197c95
parent20aa65699c4112733770100b7f0cce4ad046405e (diff)
[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 <roland@topspin.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/infiniband/core/user_mad.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index 54b4f33b0bf..56b9c2fa2ec 100644
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -389,15 +389,17 @@ static int ib_umad_reg_agent(struct ib_umad_file *file, unsigned long arg)
389 goto out; 389 goto out;
390 390
391found: 391found:
392 req.mgmt_class = ureq.mgmt_class; 392 if (ureq.mgmt_class) {
393 req.mgmt_class_version = ureq.mgmt_class_version; 393 req.mgmt_class = ureq.mgmt_class;
394 memcpy(req.method_mask, ureq.method_mask, sizeof req.method_mask); 394 req.mgmt_class_version = ureq.mgmt_class_version;
395 memcpy(req.oui, ureq.oui, sizeof req.oui); 395 memcpy(req.method_mask, ureq.method_mask, sizeof req.method_mask);
396 memcpy(req.oui, ureq.oui, sizeof req.oui);
397 }
396 398
397 agent = ib_register_mad_agent(file->port->ib_dev, file->port->port_num, 399 agent = ib_register_mad_agent(file->port->ib_dev, file->port->port_num,
398 ureq.qpn ? IB_QPT_GSI : IB_QPT_SMI, 400 ureq.qpn ? IB_QPT_GSI : IB_QPT_SMI,
399 &req, 0, send_handler, recv_handler, 401 ureq.mgmt_class ? &req : NULL,
400 file); 402 0, send_handler, recv_handler, file);
401 if (IS_ERR(agent)) { 403 if (IS_ERR(agent)) {
402 ret = PTR_ERR(agent); 404 ret = PTR_ERR(agent);
403 goto out; 405 goto out;