From: Roland Dreier <roland@topspin.com>
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>
---
25-akpm/drivers/infiniband/core/user_mad.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff -puN drivers/infiniband/core/user_mad.c~ib-fix-user-mad-registrations-with-class-0 drivers/infiniband/core/user_mad.c
--- 25/drivers/infiniband/core/user_mad.c~ib-fix-user-mad-registrations-with-class-0 Fri Apr 1 13:53:41 2005
+++ 25-akpm/drivers/infiniband/core/user_mad.c Fri Apr 1 13:53:41 2005
@@ -389,15 +389,17 @@ static int ib_umad_reg_agent(struct ib_u
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;
_