aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Apfelbaum <marcela@mellanox.co.il>2012-01-01 23:07:39 -0500
committerDavid S. Miller <davem@davemloft.net>2012-01-03 12:49:16 -0500
commit1e27ca69446e98b666b215b8ba71bf29281ce674 (patch)
tree72094253b9b3acb944d809e19a3974b9fe52b58f
parentf7d9821a6a9c83450ac35e76d3709e32fd38b76f (diff)
mlx4_core: fix mtt range deallocation
The mtt range was allocated in mtt units but deallocated in segments. Among the rest, this caused crash during hotplug removal Reported-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Marcel Apfelbaum <marcela@mellanox.co.il> Reviewed-by: Jack Morgenstein <jackm@dev.mellanox.co.il> Tested-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/mellanox/mlx4/mr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/mr.c b/drivers/net/ethernet/mellanox/mlx4/mr.c
index f7243b26bdf5..01df5567e16e 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mr.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mr.c
@@ -239,8 +239,8 @@ void __mlx4_free_mtt_range(struct mlx4_dev *dev, u32 offset, int order)
239 first_seg = offset / (1 << log_mtts_per_seg); 239 first_seg = offset / (1 << log_mtts_per_seg);
240 240
241 mlx4_buddy_free(&mr_table->mtt_buddy, first_seg, seg_order); 241 mlx4_buddy_free(&mr_table->mtt_buddy, first_seg, seg_order);
242 mlx4_table_put_range(dev, &mr_table->mtt_table, first_seg, 242 mlx4_table_put_range(dev, &mr_table->mtt_table, offset,
243 first_seg + (1 << seg_order) - 1); 243 offset + (1 << order) - 1);
244} 244}
245 245
246static void mlx4_free_mtt_range(struct mlx4_dev *dev, u32 offset, int order) 246static void mlx4_free_mtt_range(struct mlx4_dev *dev, u32 offset, int order)