projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'mmc-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
[linux-2.6-microblaze.git]
/
drivers
/
infiniband
/
hw
/
hfi1
/
vnic_main.c
diff --git
a/drivers/infiniband/hw/hfi1/vnic_main.c
b/drivers/infiniband/hw/hfi1/vnic_main.c
index
c9876d9
..
a922db5
100644
(file)
--- a/
drivers/infiniband/hw/hfi1/vnic_main.c
+++ b/
drivers/infiniband/hw/hfi1/vnic_main.c
@@
-816,14
+816,14
@@
struct net_device *hfi1_vnic_alloc_rn(struct ib_device *device,
size = sizeof(struct opa_vnic_rdma_netdev) + sizeof(*vinfo);
netdev = alloc_netdev_mqs(size, name, name_assign_type, setup,
size = sizeof(struct opa_vnic_rdma_netdev) + sizeof(*vinfo);
netdev = alloc_netdev_mqs(size, name, name_assign_type, setup,
-
chip_sdma_engines(dd)
, dd->num_vnic_contexts);
+
dd->num_sdma
, dd->num_vnic_contexts);
if (!netdev)
return ERR_PTR(-ENOMEM);
rn = netdev_priv(netdev);
vinfo = opa_vnic_dev_priv(netdev);
vinfo->dd = dd;
if (!netdev)
return ERR_PTR(-ENOMEM);
rn = netdev_priv(netdev);
vinfo = opa_vnic_dev_priv(netdev);
vinfo->dd = dd;
- vinfo->num_tx_q =
chip_sdma_engines(dd)
;
+ vinfo->num_tx_q =
dd->num_sdma
;
vinfo->num_rx_q = dd->num_vnic_contexts;
vinfo->netdev = netdev;
rn->free_rdma_netdev = hfi1_vnic_free_rn;
vinfo->num_rx_q = dd->num_vnic_contexts;
vinfo->netdev = netdev;
rn->free_rdma_netdev = hfi1_vnic_free_rn;