diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-17 16:50:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-17 16:50:59 -0700 |
| commit | 245d95a423664761d9399656098523db6988e9cc (patch) | |
| tree | 88f9484b25a0806c899fa84cfbbff334881701f4 /drivers | |
| parent | 71bfa15142177279ec63c0e400314bb81f3d7122 (diff) | |
| parent | 608d8268be392444f825b4fc8fc7c8b509627129 (diff) | |
| download | linux-3.10-245d95a423664761d9399656098523db6988e9cc.tar.gz linux-3.10-245d95a423664761d9399656098523db6988e9cc.tar.bz2 linux-3.10-245d95a423664761d9399656098523db6988e9cc.zip | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
IB/mthca: Fix data corruption after FMR unmap on Sinai
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/infiniband/hw/mthca/mthca_mr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c index fdb576dcfaa..ee561c569d5 100644 --- a/drivers/infiniband/hw/mthca/mthca_mr.c +++ b/drivers/infiniband/hw/mthca/mthca_mr.c @@ -835,6 +835,7 @@ void mthca_arbel_fmr_unmap(struct mthca_dev *dev, struct mthca_fmr *fmr) key = arbel_key_to_hw_index(fmr->ibmr.lkey); key &= dev->limits.num_mpts - 1; + key = adjust_key(dev, key); fmr->ibmr.lkey = fmr->ibmr.rkey = arbel_hw_index_to_key(key); fmr->maps = 0; |