4 files changed, 26 insertions, 8 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index 53b738b8a004..1bcead1fa2f6 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -1554,7 +1554,7 @@ int mlx4_multi_func_init(struct mlx4_dev *dev)
         return 0;
 
 err_resource:
-        mlx4_free_resource_tracker(dev);
+        mlx4_free_resource_tracker(dev, RES_TR_FREE_ALL);
 err_thread:
         flush_workqueue(priv->mfunc.master.comm_wq);
         destroy_workqueue(priv->mfunc.master.comm_wq);
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 8eed1f269323..2e94f76f8016 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -2069,6 +2069,10 @@ static void mlx4_remove_one(struct pci_dev *pdev)
                         mlx4_CLOSE_PORT(dev, p);
                 }
 
+                if (mlx4_is_master(dev))
+                        mlx4_free_resource_tracker(dev,
+                                                   RES_TR_FREE_SLAVES_ONLY);
+
                 mlx4_cleanup_counters_table(dev);
                 mlx4_cleanup_mcg_table(dev);
                 mlx4_cleanup_qp_table(dev);
@@ -2081,7 +2085,8 @@ static void mlx4_remove_one(struct pci_dev *pdev)
                 mlx4_cleanup_pd_table(dev);
 
                 if (mlx4_is_master(dev))
-                        mlx4_free_resource_tracker(dev);
+                        mlx4_free_resource_tracker(dev,
+                                                   RES_TR_FREE_STRUCTS_ONLY);
 
                 iounmap(priv->kar);
                 mlx4_uar_free(dev, &priv->driver_uar);
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
index cd56f1aea4b5..8767fbfdce34 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@ -146,6 +146,11 @@ enum mlx4_alloc_mode {
         RES_OP_MAP_ICM,
 };
 
+enum mlx4_res_tracker_free_type {
+        RES_TR_FREE_ALL,
+        RES_TR_FREE_SLAVES_ONLY,
+        RES_TR_FREE_STRUCTS_ONLY,
+};
 
 /*
  *Virtual HCR structures.
@@ -1027,7 +1032,8 @@ int mlx4_get_slave_from_resource_id(struct mlx4_dev *dev,
 void mlx4_delete_all_resources_for_slave(struct mlx4_dev *dev, int slave_id);
 int mlx4_init_resource_tracker(struct mlx4_dev *dev);
 
-void mlx4_free_resource_tracker(struct mlx4_dev *dev);
+void mlx4_free_resource_tracker(struct mlx4_dev *dev,
+                                enum mlx4_res_tracker_free_type type);
 
 int mlx4_SET_PORT_wrapper(struct mlx4_dev *dev, int slave,
                           struct mlx4_vhcr *vhcr,
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index bb09ed7a1484..549abfb5a397 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -224,16 +224,23 @@ int mlx4_init_resource_tracker(struct mlx4_dev *dev)
         return 0 ;
 }
 
-void mlx4_free_resource_tracker(struct mlx4_dev *dev)
+void mlx4_free_resource_tracker(struct mlx4_dev *dev,
+                                enum mlx4_res_tracker_free_type type)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
         int i;
 
         if (priv->mfunc.master.res_tracker.slave_list) {
-                for (i = 0 ; i < dev->num_slaves; i++)
-                        mlx4_delete_all_resources_for_slave(dev, i);
-
-                kfree(priv->mfunc.master.res_tracker.slave_list);
+                if (type != RES_TR_FREE_STRUCTS_ONLY)
+                        for (i = 0 ; i < dev->num_slaves; i++)
+                                if (type == RES_TR_FREE_ALL ||
+                                    dev->caps.function != i)
+                                        mlx4_delete_all_resources_for_slave(dev, i);
+
+                if (type != RES_TR_FREE_SLAVES_ONLY) {
+                        kfree(priv->mfunc.master.res_tracker.slave_list);
+                        priv->mfunc.master.res_tracker.slave_list = NULL;
+                }
         }
 }