diff options
| author | Joachim Fenkes <fenkes@de.ibm.com> | 2007-10-16 11:25:50 -0400 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2007-10-18 00:45:56 -0400 |
| commit | 9511724da9c090da5a6dcf6c557b1cedc4f5cfd7 (patch) | |
| tree | 793c2994b368d741c7b24164eabf33f3e2ead288 /drivers/infiniband | |
| parent | c0c84d566ddc8dbdd3ceab23865a688c36217338 (diff) | |
IB/ehca: Fix masking error in {,re}reg_phys_mr()
Signed-off-by: Joachim Fenkes <fenkes@de.ibm.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/hw/ehca/ehca_mrmw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/ehca/ehca_mrmw.c b/drivers/infiniband/hw/ehca/ehca_mrmw.c index da88738265ed..16c9efd8eeac 100644 --- a/drivers/infiniband/hw/ehca/ehca_mrmw.c +++ b/drivers/infiniband/hw/ehca/ehca_mrmw.c | |||
| @@ -259,7 +259,7 @@ struct ib_mr *ehca_reg_phys_mr(struct ib_pd *pd, | |||
| 259 | pginfo.u.phy.num_phys_buf = num_phys_buf; | 259 | pginfo.u.phy.num_phys_buf = num_phys_buf; |
| 260 | pginfo.u.phy.phys_buf_array = phys_buf_array; | 260 | pginfo.u.phy.phys_buf_array = phys_buf_array; |
| 261 | pginfo.next_hwpage = | 261 | pginfo.next_hwpage = |
| 262 | ((u64)iova_start & ~(hw_pgsize - 1)) / hw_pgsize; | 262 | ((u64)iova_start & ~PAGE_MASK) / hw_pgsize; |
| 263 | 263 | ||
| 264 | ret = ehca_reg_mr(shca, e_mr, iova_start, size, mr_access_flags, | 264 | ret = ehca_reg_mr(shca, e_mr, iova_start, size, mr_access_flags, |
| 265 | e_pd, &pginfo, &e_mr->ib.ib_mr.lkey, | 265 | e_pd, &pginfo, &e_mr->ib.ib_mr.lkey, |
| @@ -547,7 +547,7 @@ int ehca_rereg_phys_mr(struct ib_mr *mr, | |||
| 547 | pginfo.u.phy.num_phys_buf = num_phys_buf; | 547 | pginfo.u.phy.num_phys_buf = num_phys_buf; |
| 548 | pginfo.u.phy.phys_buf_array = phys_buf_array; | 548 | pginfo.u.phy.phys_buf_array = phys_buf_array; |
| 549 | pginfo.next_hwpage = | 549 | pginfo.next_hwpage = |
| 550 | ((u64)iova_start & ~(hw_pgsize - 1)) / hw_pgsize; | 550 | ((u64)iova_start & ~PAGE_MASK) / hw_pgsize; |
| 551 | } | 551 | } |
| 552 | if (mr_rereg_mask & IB_MR_REREG_ACCESS) | 552 | if (mr_rereg_mask & IB_MR_REREG_ACCESS) |
| 553 | new_acl = mr_access_flags; | 553 | new_acl = mr_access_flags; |