From: Stephen Rothwell Date: Fri, 28 Sep 2012 00:20:23 +0000 (+1000) Subject: idr-rename-max_level-to-max_idr_level-fix-fix-2-fix X-Git-Tag: next-20121005~1^2~127 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=86fc889a3f97e6d4c98e6e54271976495c03acb1;p=karo-tx-linux.git idr-rename-max_level-to-max_idr_level-fix-fix-2-fix IB/mlx4: fix for MAX_ID_MASK to MAX_IDR_MASK name change Signed-off-by: Stephen Rothwell Cc: Roland Dreier Signed-off-by: Andrew Morton --- diff --git a/drivers/infiniband/hw/mlx4/cm.c b/drivers/infiniband/hw/mlx4/cm.c index e25e4dafb8a8..80079e5a2e30 100644 --- a/drivers/infiniband/hw/mlx4/cm.c +++ b/drivers/infiniband/hw/mlx4/cm.c @@ -225,7 +225,7 @@ id_map_alloc(struct ib_device *ibdev, int slave_id, u32 sl_cm_id) ret = idr_get_new_above(&sriov->pv_id_table, ent, next_id, &id); if (!ret) { - next_id = ((unsigned) id + 1) & MAX_ID_MASK; + next_id = ((unsigned) id + 1) & MAX_IDR_MASK; ent->pv_cm_id = (u32)id; sl_id_map_add(ibdev, ent); }