git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
[sfrench/cifs-2.6.git]
/
drivers
/
infiniband
/
hw
/
mthca
/
mthca_provider.c
diff --git
a/drivers/infiniband/hw/mthca/mthca_provider.c
b/drivers/infiniband/hw/mthca/mthca_provider.c
index 23554d8bf2419441c63b5c2b062bd069225e42b8..33002530fee709aabd208d5c4c33088e45a36965 100644
(file)
--- a/
drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/
drivers/infiniband/hw/mthca/mthca_provider.c
@@
-880,9
+880,7
@@
static struct ib_mr *mthca_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
if (!mr)
return ERR_PTR(-ENOMEM);
- mr->umem = ib_umem_get(udata, start, length, acc,
- ucmd.mr_attrs & MTHCA_MR_DMASYNC);
-
+ mr->umem = ib_umem_get(udata, start, length, acc);
if (IS_ERR(mr->umem)) {
err = PTR_ERR(mr->umem);
goto err;