Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0df3bb13 authored by Roland Dreier's avatar Roland Dreier Committed by Linus Torvalds
Browse files

[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: default avatarRoland Dreier <roland@topspin.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 20aa6569

drivers/infiniband/core/user_mad.c

+8 −6
Original line number Diff line number Diff line
@@ -389,15 +389,17 @@ static int ib_umad_reg_agent(struct ib_umad_file *file, unsigned long arg) 
	goto out;



found:

	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;