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 tag 'for-next-dma_ops' of git://git.kernel.org/pub/scm/linux/kernel/git/dledfor...
[sfrench/cifs-2.6.git]
/
drivers
/
infiniband
/
hw
/
hns
/
hns_roce_main.c
diff --git
a/drivers/infiniband/hw/hns/hns_roce_main.c
b/drivers/infiniband/hw/hns/hns_roce_main.c
index 6843409fba298abf1d593d0990c49054333cf43d..c3b41f95e70a5f1c39e89d91e48653fc05e2b20a 100644
(file)
--- a/
drivers/infiniband/hw/hns/hns_roce_main.c
+++ b/
drivers/infiniband/hw/hns/hns_roce_main.c
@@
-439,7
+439,7
@@
static int hns_roce_register_device(struct hns_roce_dev *hr_dev)
ib_dev->owner = THIS_MODULE;
ib_dev->node_type = RDMA_NODE_IB_CA;
- ib_dev->d
ma_device
= dev;
+ ib_dev->d
ev.parent
= dev;
ib_dev->phys_port_cnt = hr_dev->caps.num_ports;
ib_dev->local_dma_lkey = hr_dev->caps.reserved_lkey;