diff options
| author | Eugenia Emantayev <eugenia@mellanox.co.il> | 2012-02-06 06:26:17 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-06 12:10:11 -0500 |
| commit | f08ad06c05bf58ac38ad7b2fc97b243c12459ff2 (patch) | |
| tree | 4451e3577163d8f8cb2f9474a1069384265bb241 | |
| parent | b530b1930bbd9d005345133f0ff0c556d2a52b19 (diff) | |
| download | linux-stable-f08ad06c05bf58ac38ad7b2fc97b243c12459ff2.tar.gz linux-stable-f08ad06c05bf58ac38ad7b2fc97b243c12459ff2.tar.bz2 linux-stable-f08ad06c05bf58ac38ad7b2fc97b243c12459ff2.zip | |
mlx4_core: fix memory leak at multi_func_cleanup
Perform cleanup also in non-master flow.
The VFs use communication channel as well.
Signed-off-by: Eugenia Emantayev <eugenia@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/cmd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c index 405e6ac3faf6..eaf09d4f02d0 100644 --- a/drivers/net/ethernet/mellanox/mlx4/cmd.c +++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c @@ -1616,12 +1616,12 @@ void mlx4_multi_func_cleanup(struct mlx4_dev *dev) kfree(priv->mfunc.master.slave_state[i].vlan_filter[port]); } kfree(priv->mfunc.master.slave_state); - iounmap(priv->mfunc.comm); - dma_free_coherent(&(dev->pdev->dev), PAGE_SIZE, - priv->mfunc.vhcr, - priv->mfunc.vhcr_dma); - priv->mfunc.vhcr = NULL; } + + iounmap(priv->mfunc.comm); + dma_free_coherent(&(dev->pdev->dev), PAGE_SIZE, + priv->mfunc.vhcr, priv->mfunc.vhcr_dma); + priv->mfunc.vhcr = NULL; } void mlx4_cmd_cleanup(struct mlx4_dev *dev) |