diff options
| author | Doug Ledford <dledford@redhat.com> | 2016-12-14 20:44:25 +0100 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-12-14 20:44:25 +0100 |
| commit | 86ef0beaa0bdbec70d4261977b8b4a100fe54bfe (patch) | |
| tree | d2c1b52a7a6e493bada10dbdbcd2f8511baccc66 /drivers/infiniband/hw/nes | |
| parent | Merge branch 'hfi1' into merge-test (diff) | |
| parent | IB/mthca: Replace pci_pool_alloc by pci_pool_zalloc (diff) | |
| download | linux-86ef0beaa0bdbec70d4261977b8b4a100fe54bfe.tar.xz linux-86ef0beaa0bdbec70d4261977b8b4a100fe54bfe.zip | |
Merge branch 'mlx' into merge-test
Diffstat (limited to 'drivers/infiniband/hw/nes')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_verbs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c index 42ab31d06ef9..aff9fb14768b 100644 --- a/drivers/infiniband/hw/nes/nes_verbs.c +++ b/drivers/infiniband/hw/nes/nes_verbs.c @@ -771,7 +771,8 @@ static int nes_dealloc_pd(struct ib_pd *ibpd) /** * nes_create_ah */ -static struct ib_ah *nes_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr) +static struct ib_ah *nes_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr, + struct ib_udata *udata) { return ERR_PTR(-ENOSYS); } |