mlx4_core: Multiple port type support

Multi-protocol adapters support different port types.  Each consumer
of mlx4_core queries for supported port types; in particular mlx4_ib
can no longer assume that all physical ports belong to it.  Port type
is configured through a sysfs interface.  When the type of a port is
changed, all mlx4 interfaces are unregistered, and then registered
again with the new port types.

Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
index cdca3a511e1..606f1e2ef28 100644
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -298,7 +298,7 @@ int mlx4_ib_mad_init(struct mlx4_ib_dev *dev)
         int p, q;
         int ret;
 
-        for (p = 0; p < dev->dev->caps.num_ports; ++p)
+        for (p = 0; p < dev->num_ports; ++p)
                 for (q = 0; q <= 1; ++q) {
                         agent = ib_register_mad_agent(&dev->ib_dev, p + 1,
                                                       q ? IB_QPT_GSI : IB_QPT_SMI,
@@ -314,7 +314,7 @@ int mlx4_ib_mad_init(struct mlx4_ib_dev *dev)
         return 0;
 
 err:
-        for (p = 0; p < dev->dev->caps.num_ports; ++p)
+        for (p = 0; p < dev->num_ports; ++p)
                 for (q = 0; q <= 1; ++q)
                         if (dev->send_agent[p][q])
                                 ib_unregister_mad_agent(dev->send_agent[p][q]);
@@ -327,7 +327,7 @@ void mlx4_ib_mad_cleanup(struct mlx4_ib_dev *dev)
         struct ib_mad_agent *agent;
         int p, q;
 
-        for (p = 0; p < dev->dev->caps.num_ports; ++p) {
+        for (p = 0; p < dev->num_ports; ++p) {
                 for (q = 0; q <= 1; ++q) {
                         agent = dev->send_agent[p][q];
                         dev->send_agent[p][q] = NULL;