From 70f528beedb7e357134562fe8a2dfa930bd9fd87 Mon Sep 17 00:00:00 2001 From: Hadar Hen Zion Date: Thu, 21 Mar 2013 05:55:52 +0000 Subject: [PATCH] --- yaml --- r: 361827 b: refs/heads/master c: 80cb0021163cb55b14c7c054073f89d63a2e1e40 h: refs/heads/master i: 361825: 710dffbad5ca67add3d90df2df19f5d21deda37d 361823: ab87829aa0eedc7e452821ec7cf6c74a4caa4e26 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8a5f5116877c..f78ddd1de67a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c101c81b5293cdcb616ed4948d0c4a4cfd1f481a +refs/heads/master: 80cb0021163cb55b14c7c054073f89d63a2e1e40 diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c index 2995687f1aee..0d1d9679179c 100644 --- a/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +++ b/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c @@ -3806,6 +3806,7 @@ void mlx4_delete_all_resources_for_slave(struct mlx4_dev *dev, int slave) mutex_lock(&priv->mfunc.master.res_tracker.slave_list[slave].mutex); /*VLAN*/ rem_slave_macs(dev, slave); + rem_slave_fs_rule(dev, slave); rem_slave_qps(dev, slave); rem_slave_srqs(dev, slave); rem_slave_cqs(dev, slave); @@ -3814,6 +3815,5 @@ void mlx4_delete_all_resources_for_slave(struct mlx4_dev *dev, int slave) rem_slave_mtts(dev, slave); rem_slave_counters(dev, slave); rem_slave_xrcdns(dev, slave); - rem_slave_fs_rule(dev, slave); mutex_unlock(&priv->mfunc.master.res_tracker.slave_list[slave].mutex); }