[ofa-general] [PATCH] IB/mlx4: Actually return L_Key and R_Key for fast register MRs

[Roland Dreier]

From: Vladimir Sokolovsky <vlad at mellanox.co.il>

Initialize the L_Key and R_Key for memory regions returned from
mlx4_ib_alloc_fast_reg_mr().  Otherwise callers just get garbage for
the memory keys and can't do anything useful with these MRs.

Signed-off-by: Vladimir Sokolovsky <vlad at mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
Hi Linus,

Please apply this for 2.6.27.  This fixes a new feature we merged during
the window but weren't able to test fully because device firmware wasn't
ready at the time.

I'm just sending this as a patch rather than a git pull request since I
think applying one patch from email is, if anything, easier than pulling
a git tree.  If you'd rather get singleton patches via git in the future
just let me know.

Thanks,
  Roland

 drivers/infiniband/hw/mlx4/mr.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/infiniband/hw/mlx4/mr.c b/drivers/infiniband/hw/mlx4/mr.c
index a4cdb46..87f5c5a 100644
--- a/drivers/infiniband/hw/mlx4/mr.c
+++ b/drivers/infiniband/hw/mlx4/mr.c
@@ -204,6 +204,8 @@ struct ib_mr *mlx4_ib_alloc_fast_reg_mr(struct ib_pd *pd,
 	if (err)
 		goto err_mr;
 
+	mr->ibmr.rkey = mr->ibmr.lkey = mr->mmr.key;
+
 	return &mr->ibmr;
 
 err_mr:
-- 
1.5.6.3