IB/mlx5: Save flow table priority handler instead of index

Saving the flow table priority object's pointer in the flow handle
is necessary for downstream patches since the sniffer flow table isn't
placed at the standard flow_db structure but in a different database.

Signed-off-by: Maor Gottlieb <maorg@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 87988fb..de7b5b3 100644 (file)
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -1654,7 +1654,7 @@ static int mlx5_ib_destroy_flow(struct ib_flow *flow_id)
        }
 
        mlx5_del_flow_rule(handler->rule);
        }
 
        mlx5_del_flow_rule(handler->rule);

-       put_flow_table(dev, &dev->flow_db.prios[handler->prio], true);
+       put_flow_table(dev, handler->prio, true);

        mutex_unlock(&dev->flow_db.lock);
 
        kfree(handler);
        mutex_unlock(&dev->flow_db.lock);
 
        kfree(handler);


@@ -1776,7 +1776,7 @@ static struct mlx5_ib_flow_handler *create_flow_rule(struct mlx5_ib_dev *dev,
                goto free;
        }
 
                goto free;
        }
 

-       handler->prio = ft_prio - dev->flow_db.prios;
+       handler->prio = ft_prio;

 
        ft_prio->flow_table = ft;
 free:
 
        ft_prio->flow_table = ft;
 free:

diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index a59034a..a24cc20 100644 (file)
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -150,7 +150,7 @@ struct mlx5_ib_flow_prio {
 struct mlx5_ib_flow_handler {
        struct list_head                list;
        struct ib_flow                  ibflow;
 struct mlx5_ib_flow_handler {
        struct list_head                list;
        struct ib_flow                  ibflow;

-       unsigned int                    prio;
+       struct mlx5_ib_flow_prio        *prio;

        struct mlx5_flow_rule   *rule;
 };
 
        struct mlx5_flow_rule   *rule;
 };