vserver 2.0 rc7

[linux-2.6.git] / drivers / infiniband / core / user_mad.c

diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index 54b4f33..9d912d6 100644 (file)
--- 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)
        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;
@@ -497,6 +499,7 @@ static int ib_umad_open(struct inode *inode, struct file *filp)
 static int ib_umad_close(struct inode *inode, struct file *filp)
 {
        struct ib_umad_file *file = filp->private_data;
+       struct ib_umad_packet *packet, *tmp;
        int i;
 
        for (i = 0; i < IB_UMAD_MAX_AGENTS; ++i)
@@ -505,6 +508,9 @@ static int ib_umad_close(struct inode *inode, struct file *filp)
                        ib_unregister_mad_agent(file->agent[i]);
                }
 
+       list_for_each_entry_safe(packet, tmp, &file->recv_list, list)
+               kfree(packet);
+
        kfree(file);
 
        return 0;